take measure count from the time the measure finishes, not starts
Merge branch 'master' of https://github.com/ijwatson/swamp

Conflicts:
	swamp_db.py
bugfix nweeks