Markers are working now!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/framework/controller.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/framework/controller.js
Merged changes with Krishna
updated markers
Merge remote-tracking branch 'origin/master'
adding functionality to control groups of markers
adding functionality to control groups of markers