Merge branch 'yuechenqin'
kkk
Merge branch 'master' of https://github.com/jethro894/CRM

Conflicts:
	build/classes/com/crm/ass3/DBAPI.class
k