added tendenci to settings for locale
Merge branch 'bixly-testing' of https://github.com/tendenci/tendenci into bixly-testing