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 'forum' of git://github.com/fuzzie360/coursemology.org into development

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/models/course.rb
	app/models/training.rb
	app/views/layouts/_footer.html.erb
	app/views/user_mailer/new_enroll_request.html.erb
	config/locales/en.yml
	db/schema.rb
	db/seeds.rb
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
Fix topic level next_unread query
Merge remote-tracking branch 'remotes/origin/forum-lessonbin' into development