version bump

Change-Id: Ie2c77b2a130ba8c4324aae315a14ffbabe31eab3
Merge branch 'master' into play23

Conflicts:
	build.sbt

Change-Id: Ibcde0c62f1b82a3a2918f1c964ad9c4d0e93138b