Add comments
Add configuration for deploying into external containers
Merge branch 'master' into thymeleaf
 Add comment