Friday's work
Merge remote-tracking branch 'origin/redesign-subnav'

* origin/redesign-subnav:
  Friday's work

Conflicts Resolved:
	public/js/libs/ckeditor/config.js