Merge branch 'master' of https://github.com/ms8/ms8

Conflicts:
	protected/components/UserManagement.php
	protected/controllers/PrepareController.php