experimenting branches
testing branches
first map layer added.
testing adding point to map.
Merge branch 'MapIntegration' into MapIntegration2

Conflicts:
	app/views/data.html
Create a GISService and play with referred dojo vs referred angular
Zoom to property in the map after property search.
Zoom to property after property search by folio.
Zoom again.
Merge commit '3d86e8e119e0411dc83e76196cf6c77081764415' into MapIntegration2

Conflicts:
	app/scripts/controllers/main.js
-
Merge branch 'master' of https://github.com/miamidade/property-appraisser-data-viewer

Conflicts:
	app/scripts/controllers/main.js
Merge branch 'MapIntegration2'