Merge branch '2.1' into 2.2

* 2.1:
  added missing license and type in composer.json (refs #527)
  added loader variable typehint for easier manipulation in IDEs
  updated VENDORS for 2.1.9
  removed useless "use" statement
  updated VENDORS for 2.1.8
  Update composer.json

Conflicts:
	composer.json
	composer.lock

Author: fabpot

app/autoload.php

@@ -1,7 +1,11 @@
 <?php
 
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
 
+/**
+ * @var $loader ClassLoader
+ */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
 // intl

composer.json

@@ -1,5 +1,7 @@
 {
     "name": "symfony/framework-standard-edition",
+    "license": "MIT",
+    "type": "project",
     "description": "The \"Symfony Standard Edition\" distribution",
     "autoload": {
         "psr-0": { "": "src/" }

src/Acme/DemoBundle/EventListener/ControllerListener.php

@@ -2,7 +2,6 @@
 
 namespace Acme\DemoBundle\EventListener;
 
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Acme\DemoBundle\Twig\Extension\DemoExtension;