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

Conflicts:
	appomatic_mapimport/management/commands/mapimport_fracfocus.py