Fix issue #125
Merge pull request #126 from robertsmieja/dev-gradle

Fix issue #125
Merge branch 'dev-gradle' of github.com:wpi-suite/wpi-suite into dev-gradle
Merge branch 'dev-gradle' of github.com:JustDuckItAll/wpi-suite into dev-gradle