Discussion forum feature
Merge branch 'anchen'
Merged anchen with master
Conflicts:
	ClubBiz/app/views/clubs/show.html.erb
	ClubBiz/config/routes.rb