PROBCORE-400 working on java side
Fixing merge
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	de.prob.core.kernel/src/main/java/de/prob/web/views/ValueOverTime.java
PROBCORE-400 List of formulas in view should now remain in order.