[CHORES] Added some file from branch PBI. I dont know why it was merged into...

[CHORES] Added some file from branch PBI. I dont know why it was merged into my branch instead of the other way around. Fixed merge conflict on settings.py