update versions for next release
switch dev back to master