conflict resolve
Merge branch 'master' of https://github.com/huhuo/car-rental.git

Conflicts:
	server/car-service-core/res/db/car-rental-customer.sql