Merge branch 'develop' into 2.2.0

Author: PawnKaiser

composer.json

@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": ">=5.5",
-        "symfony/framework-bundle": "~2.3",
+        "symfony/framework-bundle": ">=2.3",
         "aws/aws-sdk-php": "*"
     },
     "autoload": {