Start cleaning up users
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/users/controllers/admin.php
Merge branch 'refs/heads/3.0/develop' into production