Remove Task Creation Panel Scroll and Add Tabs
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