增加移动公式的操作
合并文件
Merge branch 'master' of https://github.com/repoproject/ims

Conflicts:
	source/src/reportconfig/report/cat_addedit.xml
	source/src/reportconfig/report/importcat.xml