changed something...
Merge branch 'AfterMerge' of github.com:Spring3/WebStore-Reanimation into localAfterMerge

Conflicts:
	web-store-persistent/src/main/java/com/bionic/web/store/persistent/dao/OrderDAOImpl.java
	web-store-webapp/src/main/java/com/bionic/web/store/rest/GoodsListController.java