Resolve of UI-test conflicts.
Merge branch 'FormulaEditorPullMaster' of https://github.com/Catrobat/Catroid into FormulaEditorPullMaster
Ui-test adapting
Merge branch 'FormulaEditorPullMaster' of https://github.com/Catrobat/Catroid into FormulaEditorPullMaster