Return Date, not JCalendar
Depend on SwingX
Use JXDatePicker, not JCalendar
Update buttons and abstacts

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/GetTasksController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/models/Task.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/models/TaskEntityManager.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/ToolbarPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/AbstractButtonPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/AbstractInformationPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/AbstractTaskPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/EditTaskButtonPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/EditTaskInformationPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/EditTaskPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/NewTaskButtonPanel.java
	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
Add view and then edit capabilities

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/AddTaskController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/AbstractButtonPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/AbstractTaskPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/EditTaskPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/NewTaskPanel.java
fix code flags

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/UpdateTaskRequestObserver.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/EditTaskPanel.java
Fix compile errors and remove null pointer exceptions, known issue, not displaying ViewTaskPanel
Merge branch 'mergefix-feature28' of https://github.com/R2-Team2/wpi-suite into mergefix-feature28

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/UpdateTaskController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/UpdateTaskRequestObserver.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/EditTaskPanel.java
Fix files to remove audit violations
Updated View docs to pass ViewTaskPanel and populate ViewTask tabbed panel
update calendar icon
Add WPI-66 functionality
clean up calendar code
Use four-space indent and remove trailing whitespace
Added all functionality of feature 28, no WPI-53 functionality(saving)
merge develop into branch
Add calendar.png to branch
Remove Critical Flags
Merge branch 'develop' into mergefix-feature28

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/MainView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/ViewEventController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/AbstractButtonPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/AbstractInformationPanel.java
Merge pull request #54 from R2-Team2/code_audit_20141124

Fix files to remove audit violations