Merge branch 'release/3.1.0'

README.md

@@ -10,8 +10,8 @@ Packages automatically registers GitLab and GitHub project web hooks to keep Sat
 push code. Packages also features a web management interface that allows for easy management of exposed
 packages and configured source control repositories.
 
-Packages 3.0 works on a plugin based system based around source code repositories. Packages 
+Packages version 3 works on a plugin based system based around source code repositories. Packages
 can trigger, with each code push, many automated tasks like documentation generation or code 
 analysis. The simple event-based architecture allows easy creation of new automation tasks.
 
-[View the docs online](http://docs.terramarlabs.com/packages/3.0)
+[View the docs online](http://docs.terramarlabs.com/packages/3.1)

composer.json

@@ -10,15 +10,17 @@
     "nice/framework": "~1.1",
     "nice/security": "~1.0",
     "nice/doctrine-orm": "~1.0",
-    "nice/twig": "~1.0",
+    "nice/twig": "2.0.x-dev",
+    "nice/templating": "1.0.x-dev",
     "chrisboulton/php-resque": "dev-master",
     "doctrine/migrations": "1.0.x-dev",
-    "symfony/debug": "~2.4",
-    "symfony/console": "~2.4",
-    "symfony/process": "~2.4",
-    "symfony/yaml": "~2.4",
+    "symfony/debug": "~2.7",
+    "symfony/console": "~2.7",
+    "symfony/process": "~2.7",
+    "symfony/yaml": "~2.7",
     "composer/satis": "dev-master",
     "composer/composer": "1.0.x-dev",
+    "sami/sami": "dev-master",
     "m4tthumphrey/php-gitlab-api": "~7.13",
     "knplabs/github-api": "~1.4"
   },
@@ -32,7 +34,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-develop": "3.0-dev",
+      "dev-develop": "3.1-dev",
       "dev-2-1-develop": "2.1-dev"
     }
   },