Merge branch 'hotfix/bumpversion'
Merge branch 'release/v1.2'
fixed version number
replace css file
Merge branch 'master' into dev