Merge branch '2.2'

Author: dunglas

composer.json

@@ -31,7 +31,7 @@
         "behat/mink-browserkit-driver": "^1.3.1",
         "behat/mink-extension": "^2.2",
         "behat/symfony2-extension": "^2.1.1",
-        "behatch/contexts": "dev-master",
+        "behatch/contexts": "^3.0@dev",
         "doctrine/annotations": "^1.2",
         "doctrine/doctrine-bundle": "^1.6.3",
         "doctrine/orm": "^2.5.2",