something
Merge pull request #1 from AliceCengal/master

Place details, initial map setup
Places json file created
Merge branch 'master' of github.com:VandyMobile/guide-android
Json parsing code started, need to fix bug in places.json
Proposal for Geolocation procedure
Map and Tours tabs added.  JSON parsing now works and is in action.  Adapters written for the agendas and lists of places.
Merge branch 'master' of https://github.com/VandyMobile/guide-android.git into branchOct18

Conflicts:
	GuideAndroid/src/edu/vanderbilt/vm/guide/GuideMain.java
added download image
Merge pull request #2 from ruiiiijiiiiang/master

added image download
added method findPlaceById in GlobalState. Added some proofing around the methods to prevent crash due to nullpointer. Parsing still not working.
The API is saved elsewhere
Merge branch 'master' of https://github.com/VandyMobile/guide-android.git into branchOct18
Merge pull request #3 from AliceCengal/branchOct18

Branch oct18
Fixed minor error in json
small adjustments with the exception handling
Created a class for Geolocation methods, possibly will also house some more advanced pathing methods.
Rewired PlaceDetailActivity so it points to the new map instead.
Marked old map implementation for removal.
Started on custom styling. Probably won't do much yet.
Prepping for merge
Merge pull request #4 from AliceCengal/branchOct18

Branch oct18
Merged Athran's changes