recuperar
Merge branch 'master' of https://github.com/VDesarrollo/Caypouez

Conflicts:
	db/migrate/20130216232304_changes.rb