Display feeds instead of subs when no current user
Merge branch 'development' of github.com:laurentqro/cantine into development

Conflicts:
	app/controllers/application_controller.rb
Fix missing 'end'