Merge branch 'design_team' into ldap

Conflicts:
	config/environments/development.rb

config/initializers/resque.rb

@@ -17,4 +17,4 @@ Dir["#{Rails.root}/app/jobs/*.rb"].each { |file| require file }
 
 # The schedule doesn't need to be stored in a YAML, it just needs to
 # be a hash.  YAML is usually the easiest.
-Resque.schedule = YAML.load_file(Rails.root.join('config', 'resque_schedule.yml'))
+Resque.schedule = YAML.load_file(Rails.root.join('config', 'resque_schedule.yml'))