Added:
+ Settings bundle
+ User Settings
+ Storyboard update for testing
+ User Settings test
Merge remote-tracking branch 'origin/master'