Adding Thymeleaf as a view resolver
Merge branch 'master' of https://github.com/searchbox/framework

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