Varias
Merge branch 'master' of https://github.com/foxcarlos/pyLoroWeb

Conflicts:
	pyLoroWeb.py