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