SaxHandler
Merge branch 'master' of https://github.com/altschuler/spaced

Conflicts:
	src/model/GameStateFactory.java
	src/model/elements/Invader.java