Merge branch 'feature-67-update_calendar_type' into feature-79-CalendarValidation
Add warning if Due Date preceeds Start Date
Merge branch 'develop' into feature-79-CalendarValidation

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/AbstractInformationPanel.java
Add activity when creating or updating task
Change log message
Add view task after save edit.
Activity message include user
Merge branch 'develop' into feature-86-activity_log

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/models/Task.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/ViewTaskPanel.java
Create test
Merge pull request #61 from R2-Team2/bugfix-84-save_returns_view

Add view task after save edit.
Add tests for both text and date validation
Merge branch 'develop' into feature-79-CalendarValidation

Conflicts:
	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
Fix audit issues and tests
Create feature branch and set framework in viewtaskpanel
Fix audit issues v2
Fix audit issues in test
Update task card truncate length
Format basic task-viewing UI as example for future development
Add date and people view
Merge branch 'develop' into feature-87-Improve_View_Panel