Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Adds rendering of \n as <br /> in news