Merge branch 'atmo-295' into gunnr
Merge branch 'atmo-295' into gunnr
Add time_period parameter to check_over_allocation.
	modified:   service/allocation.py
Merge branch 'atmo-291'