Add Activity Log to Edit Task and Improve Comment Box in View Task
Merge branch 'develop' into feature-143-activities_to_edit
Merge branch 'develop' into feature-143-activities_to_edit

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/ViewTaskInformationPanel.java
Merge pull request #114 from R2-Team2/feature-143-activities_to_edit

Feature 143 activities to edit