fixed downloading with https
Conflicts:
	catroid/src/org/catrobat/catroid/ui/MainMenuActivity.java
Merge pull request #388 from Catrobat/httpsIntent

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