integration journalist backend-frontend
Merge branch 'master' of https://github.com/davidbauer/hacksports