Merge branch 'master' of github.com:marchibbins/bootstrap-tenants into develop
Merge branch 'develop' of github.com:marchibbins/bootstrap-tenants into develop
Extending settings