vector interaction changes
Merge remote-tracking branch 'ScottSeely/map-12513' into map

Conflicts:
	src/public/app/map/controller/MapController.js
Merge WFS changes to map