Global News, but no create pages yet
Merge branch 'global_news'

Conflicts:
	app/assets/stylesheets/cloud.css.less
	app/controllers/people_controller.rb