Merge remote-tracking branch 'origin/master' into dev_jakob
made backend a java 7 project
Merge branch 'master' into dev_jakob
Merge branch 'master' into dev_jakob