Merge branch 'master' into DatatypeString

Conflicts:
	catroidTest/src/org/catrobat/catroid/uitest/stage/SpeakStageTest.java