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 missing merge conflict resolutions

When resolving merge conflicts in feature 67, several changes were made
but not committed. This hotfix contains those changes, to restore
functionality to the main development branch.
Merge pull request #59 from R2-Team2/hotfix-67

Add missing merge conflict resolutions
Fix long titles of tabs bug.
Add activity when creating or updating task
Fix audit issues
Change log message
Merge pull request #60 from R2-Team2/bugFix-83-truncate-tab-title

Fix long titles of tabs bug.
Add view task after save edit.
Activity message include user
Add comment and comment list.
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
add comments to the Task.
Create test
Merge pull request #61 from R2-Team2/bugfix-84-save_returns_view

Add view task after save edit.
Add comparator to Comment class. Test Comment class.
Merge branch 'feature-85-comment_backend' of https://github.com/R2-Team2/wpi-suite into feature-85-comment_backend
Create IDNum model and TS, WF, IDN entityman
@Authors: mcf747, pluxsuwong