Version presented at IFV
Merge branch 'master' of https://github.com/Geodan/gmi

Conflicts:
	cgi-bin/makeSubset.py
	cgi-bin/settings.py
	cgi-bin/settings.pyc