Upgrading to Rails 3.2.11
Upgrading to Rails 3.2.11
Added bootstrap
Added questionnaire
Added questionnaires
Added goal orientation survey
Merge branch 'master' of github.com:tsauvine/coursefeedback

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/course.rb
	script/rails
Configurable shibboleth attributes
Added assets