updated version numbers
Merge branch 'dev'