Sorting beforeDisplay
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/wise/scheduler/engine/engine/EngineImpl.java