DID A FUCKTON
Merge remote-tracking branch 'origin/master'
Add settings file convenience class
Merge remote-tracking branch 'origin/master'
Reset main.storyboard localization