Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into fix-interface#2

.gitlab-ci.yml

Gemfile.lock

app/assets/javascripts/application/collections.coffee

app/controllers/bookmarks_controller.rb

app/controllers/collections_controller.rb

app/controllers/users_controller.rb

app/policies/collection_policy.rb

app/views/bookmarks/_list.html.erb

app/views/bookmarks/show.html.erb

app/views/collections/show.html.erb

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

app/views/learning_objects/_form.html.erb

app/views/learning_objects/_learning_object_vertical.erb

app/views/reviews/_review.html.erb

app/views/shared/application/_search.erb

config/database.yml

config/database.yml.gitlab

config/routes.rb