Merge branch 'master' into sidekiq-workers

app/assets/images/icons/upload-add.png

app/assets/images/icons/upload.png

app/assets/images/icons/visualization.png

app/assets/javascripts/application/accessibility.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/helpers/learning_objects_helper.rb

app/repositories/orient_db/base.rb

app/repositories/orient_db/collection_repository.rb

app/repositories/orient_db/subject_repository.rb

app/views/learning_objects/_learning_object_horizontal.erb

app/views/learning_objects/_learning_object_vertical.erb

app/views/management/carousels/edit.html.erb

app/views/management/carousels/index.html.erb

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

app/views/users/show.html.erb

lib/orient_db/methods/edge_methods.rb

lib/tasks/mainPage.rake

lib/tasks/orientdb.rake