Update composer.json

Bump doctrine dependency for symfony 2.1 users.
merged branch guilhermeblanco/patch-1 (PR #498)

This PR was merged into the 2.1 branch.

Commits
-------

b118637 Update composer.json

Discussion
----------

Update composer.json

Bump doctrine dependency for symfony 2.1 users.
updated VENDORS for 2.1.8
removed useless "use" statement
merged branch aerialls/patch-1 (PR #504)

This PR was merged into the 2.1 branch.

Commits
-------

4806cf5 removed useless "use" statement

Discussion
----------

removed useless "use" statement
updated VENDORS for 2.1.9
added loader variable typehint for easier manipulation in IDEs
merged branch thunderer/autoload-class-typehint (PR #519)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #519).

Discussion
----------

Added $loader variable typehint for easier manipulation in IDEs.

Not all project dependencies are managed by Composer. Common solutions for (company / private) libraries and bundles are git submodules or even symlinked directories.

This PR adds typehint for `$loader` variable inside `app/autoload.php` so people won't need to search for information on what class it is and what interface it exposes when trying to add their code to autoloader.

Commits
-------

67e9d69 added loader variable typehint for easier manipulation in IDEs
added missing license and type in composer.json (refs #527)
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
Merge branch '2.2' of https://github.com/symfony/symfony-standard into symfony-2.2

Conflicts:
	composer.json