Fix ROOT_URLCONF in default settings
Merge branch 'dev'