Stash for merge
Adding merged files
touchscript addon updates