change #9

Timeslider (GCAMP)
除了逗逼再没有别的想法了

除了逗逼再没有别的想法了
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	charts/Thumbs.db
	images/Thumbs.db
	images/backward.png
	images/forward.png
	images/glyphicons_015_print.png
	images/glyphicons_054_clock.png
	images/glyphicons_186_move.png
	images/glyphicons_216_circle_arrow_left.png
	images/glyphicons_217_circle_arrow_right.png
	images/glyphicons_236_zoom_in.png
	images/glyphicons_237_zoom_out.png
	index.html
	print.js
	script/main.js
	style.css
Merge pull request #25 from DVAlhadeff/master

Quick Updates to charts/graphs/data.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Deleted system-created thumbs.db
Removed all diff artefacts.
change #10

clear up all the errors of toolbar; add border to the icon selected;
make the "age groups by census" checked
change #11

add CSV file (function failed to be called)
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	charts/AgeGroupChart.aux
	charts/AgeGroupChart.png
	charts/StudentPopulation.csv
	index.html
	layers.xml
	script/main.js
change # 12

Tasks needed to be done: 1. social network hyperlink; 2. info-window
didn't show up for polygon layer
Merge remote-tracking branch 'origin/master'

Conflicts:
	layers.xml
	script/CSV2JSON.js
	script/main.js
change #12

enable info-window after selecting a polygon
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	index.html
	layers.xml
	script/CSV2JSON.js
	script/main.js
change #13

enable switching base map, add zoom to full extent, change toolbar
position from absolute to relative
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	layers.xml
	script/CSV2JSON.js
	script/main.js
change #14

added zoom to full extent, added base map gallery, added new categories,
enabled time slider,
change #15

changed xmltojson function to enable single element foreach
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	charts/GSU Dorm.jpg
	images/glyphicons_370_globe_af.png
	index.html
	layers.xml
change # 16

move legend; hide legend when it shows chart