minor change
merge & resolve conflict
reset timeline width
change to zoomable map
Merge remote-tracking branch 'origin/master' into gh-pages
implement zoomable map, but not good enough now