Merge branch 'master' of https://github.com/NERC-CEH/ecomaps

Conflicts:
	ecomaps/controllers/analysis.py
	ecomaps/websetup.py
Updated to use new relationship object between an analysis and coverage datasets