Move NSUserDefaults logic out of the view controllers.
Merge branch 'master' into new_ui