testing edittasktab
committing persistence changes before switching branches
Initial steps to get edit tab functionality of the Newtasktab
added calendar and basic required fields
added required jar file
Merge branch 'CalendarandRequited' of https://github.com/dcpounds/wpi-suite into CalendarandRequited

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewTaskTab.java
Merge branch 'CalendarandRequited' of https://github.com/dcpounds/wpi-suite into CalendarandRequited

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewTaskTab.java
cleaned up merge conflict
more edit stuff
Merge branch 'dev-gradle' into AshNewTab

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/AddTaskController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewTaskTab.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/TaskContainerView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/TaskView.java
Merge branch 'dev-gradle' into CalendarandRequited

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewTaskTab.java
Merge branch 'workflowpersistence' into AshNewTab

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/AddTabController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewStageTab.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewTaskTab.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/ToolbarView.java
progress towards edit task
Merge branch 'adding-icons' into mergeallthethings

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/AddTaskController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewTaskTab.java
Merge branch 'CalendarandRequited' of https://github.com/dcpounds/wpi-suite into mergeallthethings

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/AddTaskController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewStageTab.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/tabs/view/NewTaskTab.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/TaskView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/ToolbarView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/WorkflowView.java
merging everything together
pulled everything together finally