Merge branch 'version/bump'

Bump to 2.3.1dev
Update branch aliases

- master -> 2.3-dev
- develop -> 2.4-dev
Merge branch 'hotfix/composer-branch-alias' into develop

Update composer branch aliases