gps fix
refined apartment list
Merge branch 'derek'

Conflicts:
	res/values/strings.xml