Merge branch 'mergeFixingMaster' into testmerge

Conflicts:
	catroid/src/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.java