Updated window info box content
Merge branch 'master' into gh-pages

Conflicts:
	google_maps/js/maps.view.js