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

Conflicts:
	server/car-module-system/src/main/resources/META-INF/resources/view/car-module-system/frontpage.jsp
Merge branch 'master' of https://github.com/huhuo/car-rental.git

Conflicts:
	server/car-module-system/src/main/resources/META-INF/resources/view/car-module-system/frontpage.jsp
resolve file merge
Merge branch 'master' of https://github.com/huhuo/car-rental.git

Conflicts:
	server/car-module-system/src/main/resources/META-INF/resources/view/car-module-system/frontpage.jsp
add a biz module to car rental project