Doesn't crash on backbutton
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering.git