tbd
Merge branch 'master' of github.com:germel/ovulg

Conflicts:
	nscan/templates/mapify.html
	nscan/views.py
	static/js/mysigma.js