1
Merge branch 'master' of https://github.com/tryteam/carnode.git

Conflicts:
	src/main/java/com/herokuapp/carnode/action/shop/ShopRegisterAction.java
	src/main/webapp/js/common/brand_car.js