add class hook for password strength meter on reset password form
Remove unnecessary preload divs
Added support for new ImageServer
Add features container
Merge branch 'master' of github.com:guardian/frontend into people-container

Conflicts:
	common/app/assets/stylesheets/head.facia.scss
	common/app/assets/stylesheets/module/facia/_mixins.scss
	facia/app/views/fragments/frontBody.scala.html
	facia/app/views/support/package.scala
Design tweaks across breakpoints
Load/show config
Display config.json on path /edit-config
Merge pull request #2968 from guardian/id-password-reset

Add password strength meter on reset password form
Revert omniture timestamp changes
Merge pull request #2984 from guardian/revert-timestamp

Revert omniture timestamp changes
Cache the html entrypoints
Fix typo in anayltics code
Merge pull request #2985 from guardian/revert-timestamp

Fix typo in anayltics code
Unecessary z-index
Merge pull request #2961 from guardian/remove-preloads

Remove unnecessary preload divs
Merge pull request #2979 from guardian/people-container

People container
Merge pull request #2982 from guardian/facia-tool-show-config

Facia tool: show config
Fix discussion spacing issues
Merge branch 'master' of github.com:guardian/frontend into image-service

Conflicts:
	common/app/conf/switches.scala