Refactoring of jsonoa.js to handle multiple node types
Merge branch 'master' of https://github.com/ahenrycgi/charme_plugin

Conflicts:
	CHARMe_plugin/src/plugin/js/charme.web.services.js