Merge branch 'master' into nfcTesting
Merge branch 'nfcTesting' of https://github.com/Catrobat/Catroid into nfcTesting