cambios readme
Cambios documentacion
Merge remote-tracking branch 'origin/prod' into prod

Conflicts:
	README.md