Merge remote-tracking branch 'catrobat/master' into userbricks

Conflicts:
	catroid/src/org/catrobat/catroid/formulaeditor/Formula.java
	catroid/src/org/catrobat/catroid/formulaeditor/InternFormulaParser.java
correct api level
Revert "correct api level"

This reverts commit c13a7983d6fd55abe021429c4fa565ef45254011.
working on fixing formula editor