Added thymeleaf templating engine support for testing purposes
Merge remote-tracking branch 'origin/master'