Map Initialized on Explore page using Google Maps API v3
Before merging with integration-places
Map Initialized on Explore page using Google Maps API v3
Before merging with integration-places
Added signature for showmarker after rebase
Merge branch 'InitializeMaps' of https://github.com/TaviscaSolutions/yellow-repo into InitializeMaps

Conflicts:
	javaScript/index.html
	javaScript/js/controller/mapController.js
	javaScript/js/views/mapView.js
First commit after merge
Changes to places collection and commenting done
Merge branch 'integration-places' of https://github.com/TaviscaSolutions/yellow-repo
Map Initialized on Explore page using Google Maps API v3
Before merging with integration-places
Map Initialized on Explore page using Google Maps API v3
Before merging with integration-places
Added signature for showmarker after rebase
First commit after merge
Added ShowAllMarkers and HideAllMakers
Merge branch 'InitializeMaps' of https://github.com/TaviscaSolutions/yellow-repo into InitializeMaps

Conflicts:
	javaScript/index.html
	javaScript/js/controller/appController.js
	javaScript/js/controller/mapController.js
	javaScript/js/model/places.js
	javaScript/js/router.js
	javaScript/js/views/mapView.js
ShowAllMarkers() Restored to working state
Added getIconURL() functionality in showAllMarkers(). Corrected models of coffee,outdoors,shops etc.