Merge branch 'master' into drone2

Conflicts:
	catroid/src/org/catrobat/catroid/stage/StageActivity.java
	catroid/src/org/catrobat/catroid/ui/ProgramMenuActivity.java
	catroid/src/org/catrobat/catroid/ui/ProjectActivity.java
	catroid/src/org/catrobat/catroid/ui/ScriptActivity.java