XMPP.net
[XMPP.org] Add comment
Zentyal.org
Zwiebelfreunde.de
Merge remote-tracking branch 'origin/master' into for-5.0

Conflicts:
	src/chrome/content/rules/Association-for-Progressive-Communications.xml
	src/chrome/content/rules/Debian-self-signed.xml
	src/chrome/content/rules/Debian.xml
	src/chrome/content/rules/MIT.xml
	src/chrome/content/rules/Reddit_via_pay.xml
	src/chrome/content/rules/Yahoo.xml
[Wikivs.com] Force www
Merge pull request #248 from alexmuller/add-york-ac-uk

Add simple rule for www.york.ac.uk
Merge pull request #213 from fser/master

Adding two rules
Merge pull request #212 from eduarrrd/master

Support mangaupdates.com.
Merge pull request #219 from nyantec/master

Add rules for tersee.com and *.tersee.com
Merge pull request #204 from aliclark/pubkey.is-ruleset

pubkey.is ruleset addition
Merge pull request #200 from mapkyca/secure.metoffice

Secure my metoffice stuff.
Merge pull request #195 from u451f/master

Ruleset for womenonwaves.org
Merge pull request #191 from thisishugo/uptimerobot

add uptimerobot.com ruleset
Merge pull request #189 from jsavoie/master

Initial rules for Universite SainteAnne
Merge pull request #186 from J0WI/patch-41

Update PPS.xml
Added ruleset for Stichting IAPC
Added secundary domain names for Stichting IAPC
Added rules for Stichting IAPC main domains
Added secure cookie flag