Location update timeout added.

A somewhat fake resolution to #2.
Merge branch 'location_timeout' into development

Just making sure the merge worked.

Conflicts:
	Resources/en.lproj/Localizable.strings