Updated requirements_dev
Merge branch 'web' of github.com:Cbsoftware/pressureNET-server into web
Fixed merge conflict