Merge branch 'master' of https://github.com/cqan/cbms.git

Conflicts:
	cbms-web/src/main/webapp/WEB-INF/pages/feePolicy/edit.jsp
	cbms-web/src/main/webapp/WEB-INF/pages/feePolicy/index.jsp
Merge branch 'master' of https://github.com/cqan/cbms.git