Merge branch 'master' into complaints

app/assets/images/logo_brasil.png

app/assets/images/logo_c3.png

app/assets/images/logo_fnde.jpg

app/assets/images/logo_ufpr.jpg

app/assets/javascripts/application/learning_objects.coffee

app/assets/javascripts/management/Chart.js

app/assets/javascripts/management/carousel.coffee

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/welcome.scss

app/controllers/management/statistics_controller.rb

app/controllers/users_controller.rb

app/controllers/welcome_controller.rb

app/helpers/learning_objects_helper.rb

app/models/learning_object.rb

app/models/subject.rb

app/repositories/orient_db/base.rb

app/repositories/orient_db/learning_object_repository.rb

app/repositories/orient_db/main_page_repository.rb

app/repositories/orient_db/subject_repository.rb