Merge branch 'LegoExperimental' of https://github.com/Catrobat/Catroid into LegoExperimental
fixing
Merge branch 'LegoExperimental' of https://github.com/Catrobat/Catroid into LegoExperimental

Conflicts:
	catroid/res/xml/preferences.xml
Merge branch 'legonxt' into LegoExperimental

Conflicts:
	catroid/res/xml/preferences.xml
Merge branch 'andi_legonxt' into LegoExperimental

Conflicts:
	catroid/res/xml/preferences.xml