fix various bugs on admin/xxx feature
Merge branch 'develop'