merge with master

Gemfile

Gemfile.lock

app/assets/javascripts/application.js

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

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/search.scss

app/assets/stylesheets/application/welcome.scss

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

app/controllers/learning_objects_controller.rb

app/helpers/learning_objects_helper.rb

app/models/learning_object.rb

app/models/role.rb

app/models/user.rb

app/repositories/orient_db/learning_object_repository.rb

app/repositories/orient_db/user_repository.rb

app/repositories/user_repository_proxy.rb

app/views/learning_objects/show.html.erb

app/views/search/solr/search.html.erb

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

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