fix
Merge branch 'master' of github.com:s0ber89/yii_iocms

Conflicts:
	protected/modules/manager/controllers/UsersController.php