Merge branch 'master' into thymeleaf
Moved and renamed classes
Thymeleaf integration
Merge branch 'thymeleaf'