admin change view for users
Merge branch 'master' into m_new

Conflicts:
	css/back/backend.css
	protected/controllers/SiteController.php
Merge remote-tracking branch 'origin' into m_new

Conflicts:
	protected/controllers/SiteController.php
Merge branch 'master' into m_new
Merge remote-tracking branch 'origin' into m_new

Conflicts:
	protected/controllers/SiteController.php
	protected/models/UserForm.php
	protected/modules/admin/views/user/user/edituser.php
Merge remote-tracking branch 'origin' into m_new

Conflicts:
	css/back/backend.css
	protected/models/UserForm.php
	protected/modules/admin/controllers/UserController.php
Merge remote-tracking branch 'origin' into m_new

Conflicts:
	protected/controllers/SiteController.php
Merge remote-tracking branch 'origin' into m_new
Merge remote-tracking branch 'origin' into m_new
Merge remote-tracking branch 'origin' into m_new
admin users view
Merge remote-tracking branch 'origin' into m_new

Conflicts:
	css/back/backend.css
	protected/controllers/SiteController.php
admin users' view