Merge "fixed app name : setting -> settings"