Merge branch 'release/1.6.0'

Author: michalbundyra

composer.json

@@ -23,8 +23,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5-dev",
-            "dev-develop": "1.6-dev"
+            "dev-master": "1.6-dev",
+            "dev-develop": "1.7-dev"
         },
         "zf": {
             "module": [