changes
Merge branch 'master' of https://github.com/satnambajwa85/testing

Conflicts:
	protected/controllers/UserController.php