Trying to fix stuff
Merge branch 'staging' of https://github.com/ideanl/discover into staging

Conflicts:
	.sass-cache/8f31633bfd26cfc13efffffa921702cd999e6852/form.css.sassc
	app/controllers/feed_controller.rb