Merge branches 'master' and 'dev' into dev
Fixes the landing page crashing when there was no news in the db
Merge branches 'master' and 'dev'