Bug workaround
Merge branch 'master' of github.com:SkyTruth/iuumapserver

Conflicts:
	appomatic_mapsengine/exporter.py