changed script editing and handling
Merge branch 'jsedit'