Removed served from .gitignore
Re-added served
Added served static folder
Merge branch 'web' into develop
Merge branch 'web' into develop
Merge branch 'web' into develop
Removed protocol from static assets #102
Removed protocol from static assets #102
Merge branch 'develop'
Added lock throttling #103
Merge branch 'develop'
Added lock throttling #103
Merge branch 'develop'

Conflicts:
	readings/throttles.py
Revert "Added lock throttling #103"

This reverts commit 89353541fd72994a3f98c7145091c46abd54ca9d.
Updated since_last_call
Merge branch 'develop'
Added queue size exceeded check to aggregator
Added queue size exceeded check to aggregator
Merge branch 'develop' of github.com:Cbsoftware/pressureNET-server into develop
Merge branch 'develop'