wer
ewrwe
erwr
Merge branch 'master' of https://github.com/cqan/cbms

Conflicts:
	cbms-web/src/main/resources/conf/jdbc.properties