Preferences
Merge remote-tracking branch 'origin/master'

Conflicts:
	WhereIParked/res/values/strings.xml
	WhereIParked/res/xml/preferences.xml