Added saving and also mock saving to NSUserDefaults
Merge remote-tracking branch 'origin/master'