Icon ideas
Merge branch 'master' of git://github.com/AliceCengal/guide-android
Fixed Agenda tab update bug, started Java project to convert building data to JSON format
Wrote program to parse XML file from the old Vandy Maps app.  Formatted
that JSON a little by hand.  Some work still needs to be done.  The end
result is that places.json has grown by about 2500%.
Updated places.json
Making progress on cleaning up/updating the JSON
Finished modifying JSON for now.  Still need more specific categories than just "Facility" for a lot of things
Fixed some json files, removed image download code since it was broken
Merge https://github.com/VandyMobile/guide-android

Conflicts:
	GuideAndroid/src/edu/vanderbilt/vm/guide/util/GlobalState.java