Merge branch 'devel' of https://github.com/SixAppeal/wpi-suite.git into
devel_comments_UI

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/sidebar/HistoryView.java