git repair
repair try
Merge branch 'legonxt' of https://github.com/Catrobat/Catroid into legonxt

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

Conflicts:
	catroid/res/xml/preferences.xml