Updated storyboard
Merge remote-tracking branch 'origin/master'
Switched all NSUserDefaults to the new singleton class