Merge branch 'xmoravc2' into xpetr2

# Conflicts:
#	com/src/dynamic_link.cpp
#	phx/include/phx/body_system.hpp
#	phx/include/phx/bullet/debug_renderer.hpp
#	phx/include/phx/collisions/collider.hpp
#	phx/include/phx/collisions/collider_system.hpp
#	phx/include/phx/collisions/collision_contact_id.hpp
#	phx/include/phx/collisions/collision_info.hpp
#	phx/include/phx/dynamics/rigid_body.hpp
#	phx/include/phx/dynamics/rigid_body_simulator.hpp
#	phx/include/phx/index.hpp
#	phx/include/phx/system.hpp
#	phx/src/body_system.cpp
#	phx/src/dynamics/constraints_solver.cpp
#	phx/src/dynamics/rigid_body.cpp
#	phx/src/dynamics/rigid_body_simulator.cpp
#	phx/src/index.cpp
#	phx/src/module.cpp