Chrome version 2014.11.25

Conflicts:
	chromium/manifest.json
Merge branch '4.0' of github.com:EFForg/https-everywhere into 4.0