邮件订阅、我的积分、评价管理模板
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	app/views/home/my.php
	assets/css/home.css