Tests adapted
Merge branch 'GSOC-FE1' of https://github.com/Catrobat/Catroid into GSOC-FE1

Conflicts:
	catroid/src/org/catrobat/catroid/ui/ScriptActivity.java
	catroid/src/org/catrobat/catroid/ui/fragment/FormulaEditorDataFragment.java
	catroid/src/org/catrobat/catroid/ui/fragment/FormulaEditorFragment.java
	catroidTest/src/org/catrobat/catroid/uitest/content/brick/AddItemToUserListTest.java
	catroidTest/src/org/catrobat/catroid/uitest/content/brick/ChangeVariableTest.java
	catroidTest/src/org/catrobat/catroid/uitest/content/brick/DeleteItemOfUserListTest.java
	catroidTest/src/org/catrobat/catroid/uitest/content/brick/InsertItemIntoUserListTest.java
	catroidTest/src/org/catrobat/catroid/uitest/content/brick/ReplaceItemInUserListTest.java
	catroidTest/src/org/catrobat/catroid/uitest/content/brick/SetVariableTest.java
	catroidTest/src/org/catrobat/catroid/uitest/formulaeditor/FormulaEditorDataFragmentTest.java
	catroidTest/src/org/catrobat/catroid/uitest/formulaeditor/FormulaEditorUserVariableFragmentTest.java