Fixed yii-charts
Merge branch 'master' of https://github.com/sankalpsingha/Teamsoft
Merge branch 'master' of https://github.com/sankalpsingha/Teamsoft

Conflicts:
	protected/controllers/UserController.php
	protected/views/user/index.php