Merge branch 'master' into dspace-solr-search

Gemfile

Gemfile.lock

app/controllers/application_controller.rb

app/controllers/management/users_controller.rb

app/controllers/registrations_controller.rb

app/controllers/users_controller.rb

app/helpers/management/users_helper.rb

app/helpers/registrations_helper.rb

app/models/role.rb

app/models/user.rb

app/repositories/active_record/user_repository.rb

app/repositories/orient_db/highlight_repository.rb

app/repositories/orient_db/user_repository.rb

app/views/devise/registrations/edit.html.erb

app/views/devise/registrations/new.html.erb

app/views/layouts/application.html.erb

app/views/layouts/management.html.erb

app/views/management/users/_form.html.erb

app/views/management/users/new.html.erb

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