moved import of local_settings lower down in settings.py, updated Photo model
merge conflict