Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

Gemfile

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/collections_controller.rb

app/models/collection.rb

app/repositories/orient_db/collection_repository.rb

app/views/collections/_form.html.erb

app/views/collections/edit.html.erb

app/views/collections/index.html.erb

app/views/collections/index.json.jbuilder

app/views/collections/new.html.erb

app/views/collections/show.html.erb

app/views/collections/show.json.jbuilder

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

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

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