merge with master and fix conflicts on settings.py