fix merge conflicts

.gitignore

Gemfile

Gemfile.lock

README.md

app/assets/images/star-off.svg

app/assets/images/star-on.svg

app/assets/javascripts/application.js

app/assets/javascripts/search/select2.full.js

app/assets/stylesheets/application.css.scss

app/assets/stylesheets/search/select2.min.css

app/controllers/application_controller.rb

app/controllers/management/users_controller.rb

app/controllers/registrations_controller.rb

app/controllers/search/solr_controller.rb

app/controllers/users_controller.rb

app/helpers/management/users_helper.rb

app/helpers/registrations_helper.rb

app/helpers/search/solr_helper.rb

app/models/bitstream.rb

app/models/object.rb