rding2; fix email bugs
Merge branch 'dev' of github.com:pelferina/wpi-suite into dev