Fixed minor issues, refactored configuration layout, added new integration tests, upgraded to Thymeleaf 2.1.1