Merge branch 'v1' into v2
Merge branch 'v2' of github.com:zeroturnaround/lr-demo-answers-java into v2
Removed -prod files and let LR replace existing properties files at deployment
Merge branch 'v1' into v2
Merge branch 'v2' into v3
Merge branch 'v3'
Removed -prod file suffix for mail properties also