Merge branch 'master' into develop
delete lock file
update cv
Merge branch 'develop'