IfLogic tests added
Merge branch 'FormulaEditor' of ssh://github.com/Catrobat/Catroid into FormulaEditor

Conflicts:
	catroidUiTest/src/org/catrobat/catroid/uitest/content/brick/VariableBricksTest.java