On branch Testing_Branch
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   project.properties
	new file:   res/drawable-hdpi/ggc_building_a_map.png
	new file:   res/drawable-hdpi/ggc_building_b_map.png
	modified:   res/layout/map_activity.xml
Image Zooming was added.
This commit added better UI and clear ImageButtion(s) that can be laid over any
part of the background, such as a building, to catch OnClickEvents.
This was a major commit. Many Activities and views were add to the project also all of
the images that were added can pain and zoom, with exption of the main map image that is in the background of map_activity.
Merged with upstream, sent pull request after adding database class.
Some images can now scrole and zoom with the chagning background image.
More work on scalling images was done.
Merge branch 'Testing_Branch'

Conflicts:
	AndroidManifest.xml
Most of the math for paining/zooming while keeping other images at the same scale/right location is done.

Next commit will have cleaner code, and most or all of the images liked in to this new image scaling system.
This is a commit to save the state of the code so I can make a new testing brach.
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 #57 from jsmallwo/master

Completed Banner interface
Due
add png
Merge https://github.com/ggc-itec/ggc-connect

Conflicts:
	AndroidManifest.xml
Merge branch 'Testing_Branch'

Conflicts:
	AndroidManifest.xml
man file
deleted the AndroidManifest.xml.orig file
Merge pull request #58 from Aflynch/master

Mostly working