[Composer] Add branch alias
Update CHANGELOG
Merge branch '2.0'

Conflicts:
	composer.json