big refactor;
refactor;
Merge branch 'master' of github.com:cryser29/SmashTheEvil

Conflicts:
	SmashTheEvil/App/Controllers/SharedControllerGame/SharedControllerGame.m
	SmashTheEvil/App/System/AppDelegate.m