v4
Merge branch 'CAT-1069' of https://github.com/Catrobat/Catroid into CAT-1069

Conflicts:
	catroid/src/org/catrobat/catroid/ui/dialogs/NewProjectDialog.java