Merge branch 'forum_moderator_manage' of git.wxpai.cn:scrmgroup/pisns-forum-api into forum_moderator_manage

Conflicts:
	app/controllers/mobile/forumThread.js

Conflicts:
	app/service/forumThreadService.js