fixes #484 and updates version
Merge pull request #495 from Catrobat/issue#484

fixes #484 and updates version
Merge branch 'master' into releaseAlpha

Conflicts:
	catroid/AndroidManifest.xml
	catroidTest/AndroidManifest.xml
	catroidTest/src/org/catrobat/catroid/pocketcode/test/common/StandardProjectHandlerTest.java
	catroidUiTest/AndroidManifest.xml