Upgrade thymeleaf to 2.1.3 and thymeleaf-layout-dialect to 1.2.4