fix DScript
Merge branch 'master' of github.com:assureit/AssureJS

Conflicts:
	plugins/DScript/DScript.js
	plugins/DScript/DScriptGenerator.js
update DScriptPlugin
update DScriptGen