Updated Preferences Manager

Merged username-removed-24979 requested to merge aelmahmoudy/fdroiddata:master into master