Merge branch 'approve_volunteers' into rodrigo

Conflicts:
models/volunteer.js