Merge branch 'dev-gradle' into bugfixes

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tab/ActivitiesView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tab/ClosableTabView.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tab/NewTaskTab.java