aupdate nnm-club.me
[Brighcove] Exclude video players

Conflicts:

	src/chrome/content/rules/Brightcove.xml
Merge remote-tracking branch 'yan/master'
Merge remote-tracking branch 'negres/master'
Fixing ruleset bugs from the tracker and add a few more
[Dastelefonbuch.de] Typo
Fix bugs in f3357c8
[NTP.org] Add lists.ntp.org
Add 17track.net and Igolder.com

Submitted via email by 810d4rk
Belated version bump for chromium
Don't double-count subdomains
Linting, global variable fix for Chromium
Enable mixedcontent rules for Opera

It appears that Opera does not block mixed content.
Add docusign rules
[The Business Journals] Point media & assets to akamai

Presumeably preferred.

NB: Revert this should doing so ever stop working.
[The Business Journals] Remove \w+/user/media/

Started redirecting to http.
[The Business Journals] Add/amend/remove comments
[AMD] Remove amd-member.com
[AMD] Disable ssl-developer

Expired.
Merge branch 'master' of github.com:yardenac/https-everywhere into yardenac-master