Refactoring and adding some caching for tenant#view.
Merge branch 'refactor_tenant_view' into develop
Merge branch 'develop' of github.com:amooma/GS5 into develop