fixed some door/trapdoor confusion
Merge remote-tracking branch 'origin/master'

Conflicts:
	Thermo/src/PlayState.as