add
Merge branch 'master' of https://github.com/hugozhang/doudouli

Conflicts:
	src/main/java/com/doudouli/mvc/controller/AdminController.java
	src/main/webapp/WEB-INF/jsp/admin/shopTag.jsp