misc
Merge branch 'master' of https://github.com/timmyterrezza/EGDP2

Conflicts:
	Game/Game.userprefs