caltotal project
Merge branch 'master' of https://github.com/zzzyyy/liu

Conflicts:
	app/protected/messages/zh_cn/app.php