前台增加我的积分
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	app/controllers/home/users.php
	app/views/home/my.php