Merge branch 'devel' into secret-feature-really-safe-for-git

Conflicts:

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/vie
w/toolbar/ToolbarView.java
fixed merge conflict

author: nhhughes