PSR2
Merge branch 'master' of https://github.com/dbohn/cmex

Conflicts:
	components/Cmex/Modules/Admin/Controller/User.php