lrlebrao wlparker Fixes small consistency issues
Merge branch 'dev' of http://github.com/pelferina/wpi-suite into dev