started merging tasks with activities tab
Merge branch 'dev-gradle' of https://github.com/dcpounds/wpi-suite into ta
fixed view problem
made merging activities view neater
Merge branch 'ta' into dev-gradle

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/TaskView.java
Merge remote-tracking branch 'origin/dev-gradle' into catFilter