Templatized the views.
Merge branch 'master' into spring_security

Conflicts:
	src/main/webapp/WEB-INF/spring/servletContext.xml