Merge branch 'hotfix/heroku'
confliktetes material
Merge branch 'hotfix/hf1'
Merge branch 'hotfix/hf1' into develop
späte stunde
Merge branch 'hotfix/hf2' into develop