Merge branch 'master' into feature/#415_ResourcePointer_cCmponent

# Conflicts:
#	demos/viewer/src/viewer.cpp
#	library/phx/input/openvr_controller_model_system.cpp
#	library/phx/rendering/components/mesh_handle.hpp
#	library/phx/rendering/render_passes/geometry_pass.hpp
#	library/phx/rendering/rendering_system.cpp
#	tests/src/integration_test_model_rendering.cpp
#	tests/src/test_openvr_controller_model_system.cpp