removed .btn from navbar button
added options panel and css to feed page nav btn
added option toggle
Merge branch 'master' of https://github.com/ceeK/hq

Conflicts:
	app/controllers/feed_controller.rb
	app/models/user.rb
	app/views/feed/feed.html.erb
	app/views/layouts/_navbar.html.erb