added fplatform collision

(using this code is how we can change to fly mode)
Merge remote-tracking branch 'origin/master' into Mike