fix warnings, unused imports and formating
separate jdbc context from root context
starting with jsp:template
Merge remote-tracking branch 'origin/master' into feature/java7_standard

Conflicts:
	pom.xml
	src/main/java/org/mybatis/jpetstore/domain/Cart.java
	src/main/java/org/mybatis/jpetstore/domain/Order.java
	src/main/java/org/mybatis/jpetstore/service/AccountService.java
	src/main/java/org/mybatis/jpetstore/service/CatalogService.java
	src/main/java/org/mybatis/jpetstore/service/OrderService.java
	src/main/java/org/mybatis/jpetstore/web/actions/AbstractActionBean.java
	src/main/java/org/mybatis/jpetstore/web/actions/AccountActionBean.java
	src/main/java/org/mybatis/jpetstore/web/actions/CartActionBean.java
	src/main/java/org/mybatis/jpetstore/web/actions/CatalogActionBean.java
	src/main/java/org/mybatis/jpetstore/web/actions/OrderActionBean.java
	src/main/webapp/WEB-INF/application-jdbc-context.xml
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.html
post merge fixes