need to commit to create hotfix
Merge branch 'hotfix/NGY1Y2'
Merge branch 'master' into develop
need to commit to create hotfix
Merge branch 'hotfix/NWMzOG'
Merge branch 'master' into develop
fixed conflict after git dev merge
added update version feature