Merged with upstream, sent pull request after adding database class.
Creating add screen
Merge remote-tracking branch 'upstream/master' into schedule-feature

Conflicts:
	AndroidManifest.xml
	res/layout/activity_direction.xml
	res/layout/activity_ggcdirectory.xml
	res/values/strings.xml
Merge pull request #58 from Aflynch/master

Mostly working
Added form stuff.
Initial code for grabbing schedule data
added some new locations
solved conflict
Merge pull request #60 from Aflynch/master

You can now see the buttons
completed layout for add screen
fixed manifest
Merge pull request #61 from crystalist/master

Fixed clobbered manifest file
Added functionality to clear, to clear search when selected.

Created inner classes for the listeners to clean up code.

Added "Optional" next to first and last name.
   (next sprint i plan on adding a button next to it with a ? and when
   user clicks on it itll pop up with an example)
previously added android:hint to TextViews instead of EditText
 now display properly
Changed spinner prompt
Merge remote-tracking branch 'upstream/master' into schedule-feature

Conflicts:
	AndroidManifest.xml
	res/layout/love_setup.xml
	res/values/strings.xml
Merge pull request #62 from dewguzzler/master

directory activity updated
Merge remote-tracking branch 'upstream/master' into schedule-feature
clean the project, changed the GGC map, and added current position on
map
Merge remote-tracking branch 'upstream/master'