Fixing permalinks to handle sort and to expand threaded comments
Merge remote-tracking branch 'origin/master' into jr-permalinks
Revert "Revert "Merge pull request #4089 from guardian/redux-fronts-respect-grouping-news""

This reverts commit d07fc18b58f33d41fb118cd894c736181e74685d.
improved the routes for discussions and sort order
Merge remote-tracking branch 'origin/master' into jr-permalinks
Remove unused grid system css
Prefix layout classes with l-
Rename files
Collection -> facia-slice
Adding Science to the US navigation
Enhance tweets when new updates arrive
Merge branch 'master' of github.com:guardian/frontend into remove-layoutcss

Conflicts:
	common/app/assets/stylesheets/module/commercial/_travel.scss
Coding conventions
remove unused caption fragment
Deprecate box-indent class
Deprecate box-indent class
Merge pull request #4114 from guardian/remove-layoutcss

CSS layout architecture improvements
Exclude development bundler group

Meaning all files in the :development bundler group will not be installed.

For example:

# group :development do
#   gem "scss-lint"
# end
Merge pull request #4111 from guardian/fronts-respect-grouping-news-take3

Facia: new template logic
Merge pull request #4141 from guardian/exclude-development-bundler-group

Exclude development bundler group