Fixed javascript dependencies for admin section
fixed merge