import fix
fixed import problems in single page version of manager
Merge branch 'master' into login