modify
Merge branch 'master' of https://github.com/Jiuweihu/www

Conflicts:
	tpl/user/dashboard.php