1017 可留言+回文
1018 可留言+回文
Merge branch 'master' into Laura

Conflicts:
	friendList.php
Merge pull request #3 from l443018/Laura

Laura