bob cant move furniture
Merge branch 'master' of https://github.com/ZombieEscapeBJJ/ZombieEscape into flixelTest

Conflicts:
	ZombieEscape/obj/ZombieEscapeConfig.old
	ZombieEscape/obj/ZombieEscapeConfig.xml