Add Vertical Scrollbar to Task Status WPI-25
Add Scrollbar to Workflow and Remove Workflow Title
Merge branch 'develop' into workflow-scrollbar
Apply Min and Max size to TaskStatusView in Workflow View
Merge branch 'develop' into feature-25-workflow-view

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/taskstatus/TaskStatusView.java
Merge pull request #19 from R2-Team2/feature-30-create_new_task

Enable storage of unique tasks in database
Combine Workflow UI Tweaks (WPI-25) with Sidebar
Change workflow title
Merge branch 'develop' into feature-25-workflow-view
Remove Task Creation Panel Scroll and Add Tabs
Merge pull request #20 from R2-Team2/feature-25-workflow-view

Feature 25 workflow view
Merge branch 'develop' of github.com:R2-Team2/wpi-suite into sidebar_quick_fix

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/NewTaskInformationPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/NewTaskPanel.java
Remove stray merge conflict markers
Remove another stray merge conflict marking
Merge pull request #21 from R2-Team2/sidebar_quick_fix

Remove Task Creation Panel Scroll and Add Tabs
Add function to get assignee name in task card format
Merge branch 'develop' into feature-26-putcardsinworkflow
Merge pull request #22 from R2-Team2/feature-26-putcardsinworkflow

Add function to get assignee name from task in task card format
Merge branch 'develop' into feature-31-implement_stored_task_recall

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/NewTaskPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/taskstatus/TaskStatusView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/workflowview/WorkFlowView.java