Commiting
Merge branch 'master' of https://github.com/daniel9x/vivo

Conflicts:
	elements-harvester/example-scripts/example-elements/elements.config.xml