Added ImageField
Merged settings.py