Commiting so I can merge with current trunk.
Merge branch 'master' of https://github.com/zwmcfarland/MSEF
Pushing so I can merge with trunk.
Merge branch 'master' of https://github.com/zwmcfarland/MSEF

Conflicts:
	cakephp-2.5.4/app/Model/Users.php