integrating user template
integrating user template
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/springmvc-servlet.xml