changed Privacy rules
Merge branch 'master' of https://github.com/EEXCESS/privacy-proxy.git

Conflicts:
	src/chrome/js/PrivacyRules.js