Fixed import statements in NonePermissionController and UserPermissionView
Merge branch 'team1-viewPermission' into team1-dev