work changed
work changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/wise/scheduler/engine/enums/ForceType.java
	src/main/java/com/wise/scheduler/engine/force/Force.java
	src/main/java/com/wise/scheduler/engine/project/ProjectElement.java
	src/main/java/com/wise/scheduler/engine/project/Work.java
Merge remote-tracking branch 'origin/master'