Merge branch 'gh-pages'
infowindows whatever
Merge branch 'master' into gh-pages