Various changes
Merge branch 'master' of https://github.com/Mysteries/StarGamesControlPanel

Conflicts:
	.DS_Store