Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.json

Author: rcarvello

composer.json

@@ -11,15 +11,19 @@
     }
   ],
   "require": {
-    "rcarvello/webmvcframework": "1.1.1",
     "php": ">=5.3"
   },
-  "minimum-stability": "dev",
+  "autoload": {
+    "psr-4": {
+      "\\": "/"
+    },
+    "minimum-stability": "1.1.1",
+    "prefer-stable": true
+  },
   "extra": {
     "installer-paths": {
-      "/": [
-        "rcarvello/webmvcframework"
-      ]
+      "/": ["rcarvello/webmvcframework"]
     }
   }
+
 }