Merge branch 'dev'
updated version #'s
Merge branch 'master' into dev