Update project versions
Merge branch 'matt_dev'