Changed MOD
Merge branch 'master' of https://github.com/sankalpsingha/Teamsoft

Conflicts:
	protected/controllers/UserController.php
Corrected Names
Merge branch 'master' of https://github.com/sankalpsingha/Teamsoft