add requirements, admin.py, remove local_settings
Resolved conflicts