# Conflicts:
#	application/index/view/remark/remark_follow_index.html
#	public/resource/js/RemarkFollowIndex.js
#	public/resource/js/user.js