a
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/sharad/psmvc/appconfig/WebMvcContextConfiguration.java
	src/main/webapp/WEB-INF/templates/footer.jsp
	src/main/webapp/WEB-INF/templates/header.jsp
	src/main/webapp/WEB-INF/templates/template.jsp