Merge pull request #431 from hoosteeno/privacy

Add 'No Change' to global toggle
[fix bug 851093] Display country with name instead of country code.
[bug 846049] Add Privacy Controls.
Merge pull request #432 from glogiotatidis/query-set-magic

Privacy controls