Removed protocol from static assets #102
Merge branch 'develop'
Added lock throttling #103
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	readings/throttles.py
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' of github.com:Cbsoftware/pressureNET-server into develop