activities
Merge branch 'develop' of github.com:R2-Team2/wpi-suite into feature-activity_list
Merge branch 'develop' into feature-activity_list

Conflicts:
	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/ViewTaskInformationPanel.java
Finish Merge
Merge pull request #110 from R2-Team2/feature-activity_list

Feature activity list
Merge branch 'develop' into bugfix-105-migrate_requirement_storage_to_id

Prepare for pull request.

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/ViewTaskInformationPanel.java