Merge remote-tracking branch 'remotes/origin/Edgar' into David

Conflicts:
	app/views/layouts/application.html.erb