Updated to recommended project settings for Xcode 6.0.1
Added constructor injection for inner NSUserDefaults object
Merge branch 'develop'