prueba
Merge remote-tracking branch 'Rafael/master'
algunos cambios
Merge remote-tracking branch 'Diego/master'

Conflicts:
	protected/runtime/application.log
volver
Merge remote-tracking branch 'Diego/master'
Cliente