Better GPS location
Merge remote-tracking branch 'origin/master'

Conflicts:
	ISawABird/src/com/isawabird/MainActivity.java