Merge branch 'master' of github.com:Catrobat/Catty into ide
Merge branch 'ide' of github.com:Catrobat/Catty into ide