SharedPreferences updates
Merge branch 'master' into messages_sharedpref