Merge remote-tracking branch 'origin/dev_prison_respawn'

Conflicts:
	project.properties
	src/com/example/forestgame/element/TableOfElements.java