Clean web-dev branch, prep for test server branch
Merge branch 'master' of https://github.com/JFrei86/HWserver into symp-server