Added remaining Django settings for making tests run on sources
Merge branch 'master' into support_for_Q_and_foreign_key