Merged general-admin.js with general.js