fixed some bugs that I introduced with the new function args pattern on getScript()
Merge remote-tracking branch 'origin/steve'

Conflicts:
	Resources/javascript/view/scriptExecution.js