Merge branch 'team3Master' into general-bugfixes

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/views/TaskInfoView.java