Migrated to Spring 4.0 & Thymeleaf 2.1.2