ParagraphUnshackler3000™
Merge branch 'master' into p-switch

Conflicts:
	common/app/assets/javascripts/bootstraps/common.js
Merge pull request #2354 from guardian/p-switch

Improve eyestrain KPI