xxxxx
解决事务问题
brand 图片处理 修改了show.jsp、controler
Merge branch 'master' of https://github.com/weishengshui/metro

Conflicts:
	pom.xml
	src/main/java/com/chinarewards/metro/control/brand/BrandControler.java
	src/main/java/com/chinarewards/metro/control/message/MessageControl.java
	src/main/webapp/WEB-INF/views/brand/show.jsp
	src/main/webapp/WEB-INF/web.xml