.
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
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	layers.xml
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	nbproject/project.xml
Update index.html
Update layers.xml
Update private.xml
Update project.properties
Update project.xml
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar into GretaYi-master

Conflicts:
	script/main.js
Merge branch 'GretaYi-master'
Merge branch 'master' of https://github.com/DVAlhadeff/AtlStreetcar into DVAlhadeff-master

Conflicts:
	layers.xml
	script/main.js
Merge branch 'DVAlhadeff-master'