controls moved into playerslaveunit
Merge remote-tracking branch 'origin/master'

Conflicts:
	CMSC425/src/com/piss/probe/content/world/objects/motion/InputMotionBehaviorDefinition.java
	CMSC425/src/com/piss/probe/game/model/GamePlayer.java
	CMSC425/src/com/piss/probe/game/model/world/objects/PlayerSlaveUnitInstance.java