Merge branch 'web-diff' of https://github.com/JFrei86/hwserver into web-diff
Merge branch 'web-diff' of http://github.com/JFrei86/HWserver into develop
Merge branch 'develop' of http://github.com/JFrei86/HWserver into develop
Validator should be working
Fixed merge conflicts in validator
Merge branch 'develop' of http://github.com/JFrei86/HWserver into develop