更新Facebook发消息功能
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/layouts/default.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/static/commons/api.jsp