add setting views
Merge branch 'master' into mergeMaster