Merge branch 'hotfix/branch-aliases' into release-1.0.0

Set dev-master to 0.5.x-dev, and dev-release-1.0.0 to 1.0.x-dev.

Conflicts:
	composer.lock

Author: weierophinney

composer.json

@@ -50,7 +50,8 @@
             "config-provider": "Zend\\ProblemDetails\\ConfigProvider"
         },
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "0.5.x-dev",
+            "dev-release-1.0.0": "1.0.x-dev"
         }
     },
     "scripts": {