tosca parsing fix
wsqMerge branch 'master' of github.com:CELAR/celar-server
tosca parsing fix