Merge pull request #77 from freedomofkeima/master

Add try..catch block in DisplaySettingsActivity