Cambios en las Librerias
Merge remote-tracking branch 'origin/master'

Conflicts:
	aplication/logs/log.txt