CVSettingsManager Icon
Improved unit testing for CVSettings Manager
Merge branch 'develop'