Merge branch 'legonxt' into andi_legonxt

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

Conflicts:
	catroid/res/xml/preferences.xml