Added lock throttling #103
Merge branch 'develop'

Conflicts:
	readings/throttles.py