Spam
Merge https://github.com/VandyMobile/guide-android
fixes to the picture database; skeleton for TourEditor
cleanup of the directory
a simple interface for creating mock Tour objects (just Strings)
Merge branch 'master' of git://github.com/AliceCengal/guide-android

Conflicts:
	GuideAndroid/src/edu/vanderbilt/vm/guide/ui/adapter/AlphabeticalCursorAdapter.java
	GuideAndroid/src/edu/vanderbilt/vm/guide/ui/adapter/CategoricalCursorAdapter.java
	GuideAndroid/src/edu/vanderbilt/vm/guide/ui/adapter/DistanceCursorAdapter.java
Merge branch 'master' of git://github.com/AliceCengal/guide-android