commit for merge
Merge branch 'master' of https://github.com/huhuo/car-rental.git

Conflicts:
	server/car-module-car/src/main/resources/META-INF/resources/view/car-module-car/cartype/edit-ui.jsp