uisettings
Merge remote-tracking branch 'GithubIOS/master'
changes