changes
Merge branch 'master' of github.com:patriciogonzalezvivo/mesaDelTiempo

Conflicts:
	bin/data/settings.xml