Shared preferences implemented
Merge remote-tracking branch 'upstream/master' into ms508
Merge pull request #512 from stowellm/ms508

Implemented shared preferences