Merge remote-tracking branch 'origin/task_presenters' into
task-edit-view

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/TaskManager.java
Merge remote-tracking branch 'origin/devel_task_backend' into task-edit-view
Added more fields to task edit view.
Merge remote-tracking branch 'origin/task-edit-view' into devel_guiTest

Conflicts:

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/Tas
kManager.java

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/mod
el/Task.java

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/mod
el/TaskStatus.java
Merge fixes