Fixed a conflict with adminsortable JS files
Merge branch 'editor'