Fix merging conflict in admin.js
DS Editor and Duplicator fixes