test
test
Merge branch 'master' into test2
test3
test32
Merge branch 'master' of
https://github.com/codetalker/springtemplate.git

Conflicts:
	springtemplate/src/main/webapp/WEB-INF/views/home.jsp