I should really commit more often instead of all at once.
Merge branch 'master' of https://github.com/Sdonai/BaconJam05

Conflicts:
	Event sheets/Event sheet 1.uistate.xml
	Event sheets/Event sheet 1.xml
	Layouts/Layout 1.uistate.xml
	Layouts/Layout 1.xml
	Pathfinding demo.caproj
	Pathfinding demo.capx.backup1