Merge branch 'master' of https://github.com/crystalist/ggc-connect.git
Merge branch 'master' into myfeature
Merge remote-tracking branch 'origin/master' into myfeature
Add:
1. textViewGPSOutput 
	The textviewGPSOutput is in the map_activity.xml. I put it there mostly
	for testing so I can see what the grid quadrants for a few spots at GGC
	are so I can line up the map with the grid quadrants. 
2. Frame Work for pulling GPS data
	As of this commit the the app does not have access to GPS data. However
	the frame work has been laid down to do so. The next commit will likely
	this feature, and better docs.
Add: 

1. More frame work for getting GPS data. 
	This commit might have the GPS feature working. I will be getting a new
	device soon so I can do field testing.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
This is a major commit the application is now receiving GPS data(after
about 60-90 seconds from the start of the Activity).

	TODO
	- find a way to start GPS updates faster
	- find a way to display a PDF 
	- find a way to sync up GPS data with the PDF
	- Enable zooming with the PDF
	- fine a way to move and image over the PDF to show user location
Merge remote-tracking branch 'upstream/master'
Updated credits with team member names
Merge branch 'master' of https://github.com/crystalist/ggc-connect
Merge pull request #22 from crystalist/master

Update credits with team members name
Fixed menu item "Links" with working links
Merge pull request #23 from crystalist/master

Update links with working links
Updated welcome message on the menu
Merge pull request #24 from crystalist/master

Updated welcome message
modified:   src/edu/ggc/it/map/MapActivity.java

The applicatoin now pull GPS data. I takes about 60 seconds for the first GPS data to come in.
Merge https://github.com/ggc-itec/ggc-connect into testing_branch

Conflicts:
	AndroidManifest.xml