Some changes
Merge done
Bug fixed in physics::controller