.
Merge branch 'master' of https://nestof@github.com/nestof/domoCore.git

Conflicts:
	run.py