Create better acitivity messages
Merge branch 'develop' into bugFix-145-better_activity
Merge branch 'develop' into bugFix-145-better_activity

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/EditTaskInformationPanel.java
Merge remote-tracking branch 'origin/feature-143-activities_to_edit' into bugFix-145-better_activity

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/ViewTaskInformationPanel.java
Merge branch 'develop' into bugFix-145-better_activity
Fix many errors:
Merge branch 'bugFix-145-better_activity' of https://github.com/R2-Team2/wpi-suite into bugFix-145-better_activity
Merge branch 'develop' into bugFix-145-better_activity

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/ViewTaskInformationPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/workflowview/WorkFlowView.java
Merge pull request #116 from R2-Team2/bugFix-145-better_activity

Bug fix 145 better activity