Fix conflicts

Gemfile

app/assets/javascripts/application/search.js

...s/stylesheets/accessible-html5-video-player/px-video.scss

app/assets/stylesheets/application.scss

app/controllers/learning_objects_controller.rb

app/controllers/search_controller.rb

app/helpers/learning_objects_helper.rb

app/models/concerns/reviewable.rb

app/models/learning_object.rb

app/models/user.rb

app/services/score_calculator_service.rb

app/views/learning_objects/_form.html.erb

app/views/search/_fetch.html.erb

app/views/search/index.html.erb

app/views/shared/application/_header.html.erb

app/views/shared/application/_home.html.erb

app/views/shared/application/_search.erb

app/workers/score_calculator_worker.rb

config/initializers/postgresql_database_tasks.rb

db/migrate/20160301103500_change_collections_add_score.rb