front-end changes
resolve Conflicts:javascript/admin-common.js