fixed capitalization and design stuff
Merge branch 'beta' into stable

Conflicts:
	PacMan.suo
Merge branch 'stable' of https://github.com/Szune/ErikPacMan into stable