jquery
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot/WEB-INF/template/shop/store/add.jsp
	src/net/osxx/controller/shop/StoreController.java
	src/osxx.xml