站内信对接，调整文件结构
Merge branch 'master' of https://github.com/Jensyn/cs-xiyoulinux

Conflicts:
	source/inc/user.php
	source/templates/footer.html
合并