Merge branch 'development' into dev/j2/common
Merge branch 'dev/j2/common' of github.com:migur/newsletter into dev/j2/common
Merge branch 'dev/j2/common' of github.com:migur/newsletter into dev/j2/common