Merge branch 'master' of https://github.com/Catrobat/Catroid into issue#359
Changed encoding of ParserTest.java