Added update function to DivvyMarkers. Fixed inconsistencies in functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/framework/controller.js
Added update function to DivvyMarkers. Fixed inconsistencies in functionality