Merge branch '2.x'

* 2.x:
  update branch alias

Conflicts:
	composer.json

Author: xabbuh

composer.json

@@ -35,7 +35,7 @@
     "extra": {
         "branch-alias": {
             "1.x-dev": "1.2.x-dev",
-            "2.x-dev": "2.1.x-dev",
+            "2.x-dev": "2.2.x-dev",
             "dev-master": "3.0.x-dev"
         }
     }