updated version number for dev
Merge branch 'master' into admin-navigation