Fix rule for University of Strasbourg
[Ubuntu] Added the login subdomain
Added a partial ruleset for GitCafe
Import Plurk ruleset

This was lurking in a needs_review ticket for a long time...
https://trac.torproject.org/projects/tor/ticket/5802
[VK] new user-contributed rule for VKontakte; turn off old rule

Thanks to Valery Petrov.
Merge branch 'master' of git://gitweb.torproject.org/https-everywhere
Merge branch 'master' of https://github.com/diracdeltas/https-everywhere
[GreatFire] new user-contributed rule for GreatFire.org

Thanks to Johan.
[RT] Disable the main Russia Today rule

https://trac.torproject.org/projects/tor/ticket/8630
Merge git://github.com/galenide/https-everywhere

Conflicts:
	src/chrome/content/rules/Ubuntu.xml
new user-contributed rules for Caseking, Mysn, SEUR, XTube, Zwame

Thanks to Andre.
[TPB.me] new user-contributed rule for tpb.me

Thanks to Johan.
Merge https://github.com/lamyj/https-everywhere
Add rules for hobbyking.com

Signed-off-by: Krzysztof Burghardt <krzysztof@burghardt.pl>
[GoogleServices] hostednews now appears to work; enabling
[TheEroticReview] New user-contributed rule for TheEroticReview
[ADISC] New user-contributed rule for ADISC

Thanks to Captain Felix.
[Newgrounds] this ruleset is reported broken for submitting reviews
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'