Various fixes
Merge branch 'master' of https://github.com/Greatlemer/GameHack2013

Conflicts:
	GameHack2013.userprefs