g
f
commit -a
Merge branch 'dev_branch' of https://github.com/zhengling1201/Hiscms into qa_branch

Conflicts:
	dev.c
f
del all