Cleanup.
Merge branch 'master' of https://github.com/tsrastafan/Where-is-my-Ride-

Conflicts:
	Where is my Ride?/Model/WIMRLocationModel.m
Cleanup.
Bugfix: geocodeLocation re-enabled