Merge branch 'master' into DatatypeString

Conflicts:
	catroid/src/org/catrobat/catroid/common/BrickValues.java