Merge commit '6f22f9d5'

* commit '6f22f9d5':
  Squashed 'Modules/Media/' changes from b312928..bbf559a

Modules/Media/composer.json

+{
+  "name": "asgardcms/media-module",
+  "type": "asgard-module",
+  "description": "Media module for AsgardCMS. Handles the media library.",
+  "keywords": [
+    "asgardcms",
+    "media",
+    "files",
+    "library",
+    "thumbnails",
+    "filters"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Nicolas Widart",
+      "email": "info@asgardcms.com",
+      "role": "Developer"
+    }
+  ],
+  "support": {
+    "email": "support@asgardcms.com",
+    "issues": "https://github.com/AsgardCms/Media/issues",
+    "source": "https://github.com/AsgardCms/Media"
+  },
+  "require": {
+    "php": ">=5.4",
+    "composer/installers": "~1.0"
+  },
+  "minimum-stability": "dev"
+}