display bug fix, badge removed from company
remove unused models
category bar
Merge branch 'master' of github.com:drunkhacker/ceotalk

Conflicts:
	app/admin/post.rb
	app/admin/talk.rb