Add platform specific controls
Added collision manager file (empty)
Merge remote-tracking branch 'origin/master' into Victor's_Branch