db design conflict
Merge branch 'master' of https://github.com/beming/BillMgr

Conflicts:
	db_design/billmgr.cdb
	db_design/billmgr.cdm