admin jquery + media
merge conflict