let's see what happened...   Merge remote-tracking branch 'origin/tutorial_master' into tut_merge

Conflicts:
	catroid/.settings/org.eclipse.jdt.core.prefs
	catroid/.settings/org.eclipse.jdt.ui.prefs
	catroid/AndroidManifest.xml
	catroid/build.properties
	catroid/project.properties
	catroid/res/layout/activity_main_menu.xml
	catroid/res/values-de/strings.xml
	catroid/res/values/ids.xml
	catroid/res/values/strings.xml
	catroid/src/at/tugraz/ist/catroid/LegoNXT/LegoNXT.java
	catroid/src/at/tugraz/ist/catroid/ProjectManager.java
	catroid/src/at/tugraz/ist/catroid/io/StorageHandler.java
	catroid/src/at/tugraz/ist/catroid/stage/PreStageActivity.java
	catroid/src/at/tugraz/ist/catroid/ui/CostumeActivity.java
	catroid/src/at/tugraz/ist/catroid/ui/MainMenuActivity.java
	catroid/src/at/tugraz/ist/catroid/ui/ProjectActivity.java
	catroid/src/at/tugraz/ist/catroid/ui/ScriptActivity.java
	catroid/src/at/tugraz/ist/catroid/ui/ScriptTabActivity.java
	catroid/src/at/tugraz/ist/catroid/ui/SoundActivity.java
	catroid/src/at/tugraz/ist/catroid/ui/dialogs/AddBrickDialog.java
	catroid/src/at/tugraz/ist/catroid/ui/dialogs/BrickCategoryDialog.java
	catroid/src/at/tugraz/ist/catroid/ui/dialogs/LoadProjectDialog.java
	catroid/src/at/tugraz/ist/catroid/ui/dialogs/NewSpriteDialog.java
	catroidTest/.classpath
	catroidUiTest/.classpath
merge not finished yet...
still not perfect, at least some things work