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