Merge remote-tracking branch 'origin/userbricks-gsoc2014' into userbricks-gsoc2014

Conflicts:
	.idea/misc.xml
	Catroid.iml
	catroid/res/values-de/strings.xml
	catroid/res/values/strings.xml
	catroid/src/org/catrobat/catroid/content/Sprite.java
	catroid/src/org/catrobat/catroid/content/actions/SetVariableAction.java
	catroid/src/org/catrobat/catroid/content/actions/UserBrickAction.java
	catroid/src/org/catrobat/catroid/content/bricks/UserScriptDefinitionBrick.java
	catroid/src/org/catrobat/catroid/formulaeditor/UserVariablesContainer.java
	catroid/src/org/catrobat/catroid/stage/StageListener.java
	catroid/src/org/catrobat/catroid/ui/UserBrickScriptActivity.java
	catroid/src/org/catrobat/catroid/ui/adapter/BrickAdapter.java
	catroid/src/org/catrobat/catroid/ui/fragment/AddBrickFragment.java
	catroid/src/org/catrobat/catroid/ui/fragment/BrickCategoryFragment.java
	catroid/src/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.java
	catroidSourceTest/catroidSourceTest.iml
	catroidTest/src/org/catrobat/catroid/uitest/content/interaction/UserBrickTest.java
	catroidTest/src/org/catrobat/catroid/uitest/util/UiTestUtils.java

don't show toast now, add a Userbrick to an existing Userbrick is just not possible anymore for now

When deleting Userbricks in "AddBrickFragment" the Actionmode Title is updated correctly

fixed GSOCSF-19 Using parameters in a userbrick doesn't work in some cases
fixed GSOCSF-17 Forever loop gets inserted in wrong way

changed SpriteTest and removed unused imports

Merge remote-tracking branch 'origin/userbricks-gsoc2014' into userbricks-gsoc2014

Conflicts:
	.idea/misc.xml
	Catroid.iml
	catroid/res/values-de/strings.xml
	catroid/res/values/strings.xml
	catroid/src/org/catrobat/catroid/content/Sprite.java
	catroid/src/org/catrobat/catroid/content/actions/SetVariableAction.java
	catroid/src/org/catrobat/catroid/content/actions/UserBrickAction.java
	catroid/src/org/catrobat/catroid/content/bricks/UserScriptDefinitionBrick.java
	catroid/src/org/catrobat/catroid/formulaeditor/UserVariablesContainer.java
	catroid/src/org/catrobat/catroid/stage/StageListener.java
	catroid/src/org/catrobat/catroid/ui/UserBrickScriptActivity.java
	catroid/src/org/catrobat/catroid/ui/adapter/BrickAdapter.java
	catroid/src/org/catrobat/catroid/ui/fragment/AddBrickFragment.java
	catroid/src/org/catrobat/catroid/ui/fragment/BrickCategoryFragment.java
	catroid/src/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.java
	catroidSourceTest/catroidSourceTest.iml
	catroidTest/src/org/catrobat/catroid/uitest/content/interaction/UserBrickTest.java
	catroidTest/src/org/catrobat/catroid/uitest/util/UiTestUtils.java

don't show toast now, add a Userbrick to an existing Userbrick is just not possible anymore for now

When deleting Userbricks in "AddBrickFragment" the Actionmode Title is updated correctly

fixed GSOCSF-19 Using parameters in a userbrick doesn't work in some cases
fixed GSOCSF-17 Forever loop gets inserted in wrong way

changed SpriteTest and removed unused imports

GSOCSF-20 deleted testNullSprite and tried changes in PreStageActivity, problem didn't return.

GSOCSF-20 deleted testNullSprite and tried changes in PreStageActivity, problem didn't return.

gradle-wrapper.properties