Merge branch 'settings' of https://github.com/yuyang226/UniversalPhotoStudio
Merge branch 'master' of https://github.com/yuyang226/UniversalPhotoStudio
secondary menu item icon change