[Composer] Fix branch alias on 2.0 branch
Merge branch '2.0'

Conflicts:
	composer.json
Upgrade CKEditor to 4.2
Update CHANGELOG
Merge branch '2.0'