merge from master

.gitignore

app/assets/images/fnde.png

app/assets/images/icons/Copiar_Seleção.png

app/assets/images/icons/Download_01.png

app/assets/images/icons/Mover_Seleção.png

app/assets/images/icons/Remover_da_Coleção_Seleção.png

app/assets/images/icons/downloadred.png

app/assets/images/icons/foldergreen.png

app/assets/images/icons/signup.png

app/assets/images/logo_brasil.png

app/assets/images/logo_ministerio.png

app/assets/javascripts/application.js

app/assets/javascripts/application/accessibility.js

app/assets/javascripts/application/search.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/search.scss

app/builders/learning_object_builder.rb

app/controllers/collections_controller.rb

app/controllers/learning_objects_controller.rb