Merge "StashEdit: Refactor and simplify edit.stash.js"