added a few rules
Merge branch 'master' of https://github.com/EFForg/https-everywhere
added the htwg konstanz webmailer
Merge branch 'master' of https://github.com/EFForg/https-everywhere
Merge branch 'master' of https://github.com/EFForg/https-everywhere
more flexible sub-domains for the reddit-rule
Merge branch 'master' of https://github.com/EFForg/https-everywhere

Conflicts:
	src/chrome/content/rules/Reddit.xml
[Apache] Add exclusions

https://trac.torproject.org/projects/tor/ticket/13146
[Apache] Split false MCB coverage
[Apache] Add comments
[bit.ly vanity domains] Add dly.do
[Blogger] Update favicon rule
[Box] Add exclusion
[Courage Campaign] Remove secure, mixedcontent → default_off

secure no longer exists.
[Courage Campaign] Add coverage
[Courage Campaign] Add comment
[Courage Campaign] Cosmetics
[Dropbox] Add/amend comments
[ExactTarget] Remove platform

None in sight.
[ExactTarget] Add coverage