Fix branch-alias for composer

- dev-master is now 2.1-dev, dev-develop is now 2.2-dev
Merge branch 'hotfix/composer-alias'