.
Con algunas excepciones
porte nicolas
AJUSTES NICOLAS
Merge remote-tracking branch 'master/master'

Conflicts:
	protected/runtime/application.log
Cambio Nicolas