Trying to make it possible to run with or without tentant on heroku
Fixed settings import