Merge branch 'master' of https://github.com/cdcueva/oliwi into tweeks_tenant_profile
Added find or create by so tenants without settings can edit.
some more translation added to nav bar#
Merge pull request #56 from cdcueva/fix_setting_error

Fix setting error