Merge of formulaedtior.
Resolve of FormulaElement conflicts.
Merge branch 'FormulaEditorHobelMerge' of https://github.com/Catrobat/Catroid into FormulaEditorHobelMerge