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

Conflicts:
	protected/views/status/_form.php
	protected/views/user/index.php