compileable again :)
Merge pull request #260 from Catrobat/StephanFellhofer

compileable again :)
Merge branch 'master' of https://github.com/Catrobat/Catroid into FEFragmentLintErrorFix