Change vssettings
some changes
fix bugs
Merge branch 'develop'