Issue#249

fixes #249, #589

Jenkins:
https://jenkins.catrob.at/job/Catroid-Multi-Job-Custom-Branch/178/
https://jenkins.catrob.at/view/Catroid/job/Catroid-single-UI-emulator/136/