log
Merge remote-tracking branch 'origin/master'

Conflicts:
	proyectosw3/protected/runtime/application.log