Update branch alias.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2
Bump php version

Signed-off-by: crynobone <crynobone@gmail.com>
Update changelog.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.2'

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	composer.json