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

Gemfile

Gemfile.lock

app/assets/javascripts/application/about.coffee

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/about.scss

app/assets/stylesheets/application/welcome.scss

app/builders/learning_object/draft_builder.rb

app/builders/learning_object_builder.rb

app/controllers/about_controller.rb

app/controllers/chunks_controller.rb

app/controllers/learning_objects_controller.rb

app/controllers/search_controller.rb

app/helpers/about_helper.rb

app/helpers/learning_objects_helper.rb

app/models/complaint_reason.rb

app/models/learning_object.rb

app/models/review.rb

app/models/score.rb

app/models/topic.rb

app/models/user_category.rb