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

app/assets/images/logo.png

app/assets/images/user-anon.png

app/assets/javascripts/application.js

app/assets/javascripts/application/collections.coffee

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/users.scss

app/controllers/users_controller.rb

app/models/search.rb

app/models/user.rb

app/views/collections/_collection.html.erb

app/views/collections/_create.html.erb

app/views/collections/_form.html.erb

app/views/collections/index.html.erb

app/views/learning_objects/_learning_object.erb

app/views/learning_objects/_learning_object_horizontal.erb

app/views/learning_objects/_learning_object_vertical.erb

app/views/search/index.html.erb

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

app/views/users/show.html.erb

config/routes.rb