Fix merge

Gemfile

Gemfile.lock

app/assets/javascripts/application.js

app/assets/javascripts/application/about.coffee

app/assets/javascripts/application/columns.js

app/assets/javascripts/application/search.js

app/assets/javascripts/links.coffee

app/assets/javascripts/management.js

app/assets/javascripts/management/scores.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/about.scss

app/assets/stylesheets/application/search.scss

app/assets/stylesheets/application/welcome.scss

app/assets/stylesheets/links.scss

app/builders/learning_object/draft_builder.rb

app/builders/learning_object_builder.rb

app/controllers/about_controller.rb

app/controllers/callbacks_controller.rb

app/controllers/chunks_controller.rb

app/controllers/collections_controller.rb