feed setup in application controller
Merge branch 'views2' into development

Conflicts:
	app/views/feeds/index.html.haml
Merge branch 'development' of github.com:laurentqro/cantine into development

Conflicts:
	app/controllers/application_controller.rb