Merge remote-tracking branch 'origin/dpseaman-DnD_testing' into devel

Conflicts:

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

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/vie
w/sidebar/TaskDetailView.java

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/vie
w/sidebar/TaskEditView.java