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 development

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/models/course.rb
	app/models/training.rb
	config/locales/en.yml
	db/schema.rb
	db/seeds.rb