Merge branch 'master' of https://github.com/mehikmat/java-stuffs

Conflicts:
	spring-xmple/spring-mvc-xmple/pom.xml
	spring-xmple/spring-mvc-xmple/src/main/webapp/WEB-INF/spring-mvc-xmple-servlet.xml