stash merge
deleting userdata file
Merge remote-tracking branch 'origin/master' into Geolocation

Conflicts:
	.gitignore
Core location manager working
Took out unneeded code
geolocation works now, search for city more sophisticated
Added documentation
Merge pull request #2 from tomstrassner/Geolocation

Geolocation and search improvement