merging changes from dev to master - includes settings.py