Merge branch '1.2'

Author: lsmith77

composer.json

@@ -18,8 +18,8 @@
         "doctrine/phpcr-odm": "~1.0",
         "doctrine/phpcr-bundle": "~1.0",
         "doctrine/data-fixtures": "~1.0",
-        "jackalope/jackalope": "~1.0",
-        "jackalope/jackalope-doctrine-dbal": "~1.0"
+        "jackalope/jackalope": "~1.1,>=1.1.5",
+        "jackalope/jackalope-doctrine-dbal": "~1.1,>=1.1.0"
     },
     "autoload": {
         "psr-4": {