nevermind, js at the end screws up the maps
Merge branch 'master' into gh-pages