These will probably need to be overwritten
Merge branch 'master' of https://github.com/zwmcfarland/MSEF

Conflicts:
	cakephp-2.5.4/app/Controller/UsersController.php