Will this work ?
Merge branch 'master' into userbricks

Conflicts:
	catroid/src/org/catrobat/catroid/formulaeditor/Formula.java
	catroid/src/org/catrobat/catroid/formulaeditor/InternFormulaParser.java