enabling menus to be configured via yaml
Merge branch 'master' into feature-config-menus

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #44 from theodi/feature-config-menus

enabling menus to be configured via yaml
Merge branch 'master' into feature-ordered-news