Moving forward - filter & grid/point connection
Merge branch 'master' of https://github.com/MarkInNVA/opAtlas

Conflicts:
	app/controller/Main.js
	app/model/ApointModel.js
	app/ux/ArcMapView2.js
Merge branch 'master' of https://github.com/MarkInNVA/opAtlas

Conflicts:
	app/controller/Main.js
	app/model/ApointModel.js
	app/ux/ArcMapView2.js

Signed-off-by: mreidy <mreidy@usgs.gov>
clean up