Removed jpg dependency
Merge branch 'web' of github.com:Cbsoftware/pressureNET-server into web
Uncommented Chartbeat
Merge branch 'web' of https://github.com/Cbsoftware/pressureNET-server into web

Conflicts:
	.ebextensions/pip.config