back to mapinfo
Merge branch 'master' into deploy

Conflicts:
	dumpers/dump_layer.sh
	dumpers/dump_layer_sql.sh