Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'dev'
updates version and adds some more tags