update some model
testMerge branch 'master' of https://github.com/lambao/V_Contract

Conflicts:
	.idea/workspace.xml
	log/development.log