Automatically use shibboleth test attributes in development mode
Remove curriculum from study plans
Remove experiment
Update 2014 curriculum
Polishing UI
Merge branch 'master' of github.com:tsauvine/o4

Conflicts:
	app/controllers/frontpage_controller.rb
	app/controllers/plans_controller.rb
	db/schema.rb
Disable treatment