fix cancan permission for forum
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy

Conflicts:
	app/decorator/controllers/forem/admin/base_controller_decorator.rb
precompiled assets
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
precompiled assets
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
fix fb button position
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
precompiled assts
fix for coding review problem
fix code review problem, html tag escape
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy

Conflicts:
	Gemfile.lock
precompiled assets
uncommenet forum count
revert back
Merge branch 'master' of github.com:Coursemology/coursemology.org
Create the schema and the routes for the new Forum component.
Restore the routes to forem; just make sure that it's renamed as "forem" so we can still look into it if we want to. I'll reserve the "forum" route for the implementation I'm writing.
Implement the index for all forums in a course.