adding features to gps
Merge branch 'master' of http://github.com/sithera/Alzheimer_GPS

Conflicts:
	Alzheimer_GPS/AndroidManifest.xml
	Alzheimer_GPS/bin/Alzheimer_GPS.apk
	Alzheimer_GPS/bin/AndroidManifest.xml
	Alzheimer_GPS/bin/classes.dex
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/DisplayAdapter.class
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/GpsActivity.class
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/MainActivity$1.class
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/MainActivity.class
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/R$id.class
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/R$layout.class
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/R$menu.class
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/R$string.class
	Alzheimer_GPS/bin/classes/pl/soad/alzheimer_gps/R$style.class
	Alzheimer_GPS/bin/resources.ap_
	Alzheimer_GPS/gen/pl/soad/alzheimer_gps/R.java
	Alzheimer_GPS/res/layout/activity_gps.xml
	Alzheimer_GPS/src/pl/soad/alzheimer_gps/GpsActivity.java