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

Gemfile

Gemfile.lock

app/assets/javascripts/application.js

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/users.scss

app/assets/stylesheets/application/welcome.scss

app/controllers/search_controller.rb

app/controllers/welcome_controller.rb

app/helpers/learning_objects_helper.rb

app/models/user.rb

app/repositories/orient_db/learning_object_repository.rb

app/views/kaminari/_first_page.html.erb

app/views/kaminari/_gap.html.erb

app/views/kaminari/_last_page.html.erb

app/views/kaminari/_next_page.html.erb

app/views/kaminari/_page.html.erb

app/views/kaminari/_paginator.html.erb

app/views/kaminari/_prev_page.html.erb

app/views/search/index.html.erb

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