Merge branch 'dev-gradle' into add-tabs. This might break things...

Conflicts:
	TaskManager/src/main/java/taskManager/JanewayModule.java
	TaskManager/src/main/java/taskManager/controller/EditTaskController.java
	TaskManager/src/main/java/taskManager/controller/TaskController.java
	TaskManager/src/main/java/taskManager/controller/ToolbarController.java
	TaskManager/src/main/java/taskManager/controller/WorkflowController.java
	TaskManager/src/main/java/taskManager/view/EditTaskView.java
	TaskManager/src/main/java/taskManager/view/ToolbarView.java
currently have 500 internal server error
small code move
fixed a bug