Changed a couple names to facilitate deployment on Tiki
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev