- migrated repo
Merge branch 'master' of github.com:sonologic/ohm-gis

Conflicts:
	1141-6006-1-gmc-cropped.dxf
	layers.py