Merge branch 'feature/ApplyCorrectFormula' into develop

Conflicts:
	webinterface/js/js.js