解决个人设置页面的问题
Merge branch 'tuesday'

Conflicts:
	script/homepage.js
	server/module/user.php