Signed-off-by: shy2850 <shy2850@163.com>
Merge https://github.com/shy2850/xhcms_2014

Conflicts:
	frame/js/frame.js
SVN冲突解决失败，重新提交