-Script to convert xml data to json
-Script to convert Xml data to Json
Merge branch 'master' of github.com:lizenn/occi-js

Conflicts:
	scripts/vendor/json/xml2json.js