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

app/assets/javascripts/application.js

app/assets/javascripts/application/collections.coffee

...ssets/javascripts/application/learning_objects.coffee.erb

app/builders/learning_object_builder.rb

app/controllers/collections_controller.rb

app/controllers/learning_objects/build_controller.rb

app/controllers/learning_objects_controller.rb

app/controllers/users_controller.rb

app/controllers/welcome_controller.rb

app/helpers/collections_helper.rb

app/helpers/learning_objects_helper.rb

app/helpers/users_helper.rb

app/models/collection.rb

app/policies/collection_policy.rb

app/policies/learning_object_policy.rb

app/views/bookmarks/show.html.erb

app/views/collections/_form.html.erb

app/views/collections/list.html.erb

app/views/collections/show.html.erb

app/views/follows/_button.html.erb