Merge origin/master

Conflicts:
	protected/controllers/UsersController.php
Merge origin/master

Conflicts:
	protected/controllers/UsersController.php
Merge origin/master

Conflicts:
	protected/controllers/UsersController.php