Enable cache control for 3600 seconds
Merge branch 'master' of https://github.com/slambour/enib-cai-spring

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