Merge branch 'GSOC-FE1' of https://github.com/Catrobat/Catroid into GSOC-FE1
Merge branch 'GSOC-FE1' of https://github.com/Catrobat/Catroid into GSOC-FE1