added platform trap to client
added some server stuff
moving trap finished
Merge branch 'master' into platformtrap