There've been test changes;
Merge branch 'master' of https://github.com/cryser29/SmashTheEvil

Conflicts:
	SmashTheEvil/App/System/AppDelegate.m