manage refuse + valide
romain changes
resolution conflit
conflit
conflit
conflit
Merge branch 'master' of https://github.com/romainroufast/materialborrows
Conflicts:
    app/controllers/requests_controller.rb