Fixed tenant admin UI issue
Merge branch 'master' of https://github.com/oaeproject/3akai-ux