adding chuck changes
Merge branch 'master' of github.com:gouravjeet/SGIS-2.0
adding info window when clicking marker on map and new slider and various new icons
Conflicts:
	app/views/main.html