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 remote-tracking branch 'upstream/master'