tmp
Merge branch 'master' into dev
quickfix
weekly report improvements
weekly report improvements 2.
weekly report improvements 3.
newsletter improvements