Motion behavior stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	CMSC425/src/com/piss/probe/game/model/world/objects/ObjectInstance.java