fixed issues #910, #909 and #906

Jenkins running
URL: https://jenkins.catrob.at/job/Catroid-Multi-Job-Custom-Branch/1287/