Merge remote-tracking branch 'origin/xmoravc2' into xpetr2

# Conflicts:
#	com/include/com/context.hpp
#	com/include/com/frame.hpp
#	com/src/context.cpp
#	com/src/frame.cpp
#	phx/include/phx/body_system.hpp
#	phx/include/phx/bullet/type_convert.hpp
#	phx/src/body_system.cpp