toolbar changes
Merge branch 'dev-gradle' of https://github.com/dcpounds/wpi-suite into dev-gradle