merge
merge
updata admin.js