Partial merge
Merge branch 'FormulaEditorHobelMerge' of ssh://github.com/Catrobat/Catroid into FormulaEditorHobelMerge