updated VENDORS for 2.0.19
updated vendors to dev branches
added default configuration for trusted proxies
updated VENDORS for 2.0.20
updated vendors to dev branches
Merge branch '2.0' into 2.1

* 2.0:
  updated vendors to dev branches
  updated VENDORS for 2.0.20
  added default configuration for trusted proxies
  updated vendors to dev branches
  updated VENDORS for 2.0.19

Conflicts:
	app/config/config.yml
	deps.lock
updated VENDORS for 2.1.5
added a warning about a security issue when using the _internal route
Merge branch '2.0' into 2.1

* 2.0:
  added a warning about a security issue when using the _internal route
updated VENDORS for 2.0.21
updated vendors to dev branches
updated VENDORS for 2.1.6
fixed 2.1.6 composer.lock file
Add description about the upgrade of app/appKernel.php
Updated year range in LICENSE
merged branch gajdaw/year (PR #467)

This PR was merged into the 2.0 branch.

Commits
-------

8f40361 Updated year range in LICENSE

Discussion
----------

Updated year range in LICENSE
fixed security example configuration for the /_internal prefix
Merge branch '2.0' into 2.1

* 2.0:
  fixed security example configuration for the /_internal prefix
  Updated year range in LICENSE
  updated vendors to dev branches
  updated VENDORS for 2.0.21

Conflicts:
	app/config/security.yml
	deps.lock
Updated DoctrineBundle to 1.1.*
merged branch stof/patch-1 (PR #473)

This PR was merged into the 2.1 branch.

Commits
-------

b675b84 Updated DoctrineBundle to 1.1.*

Discussion
----------

Updated DoctrineBundle to 1.1.*

The branch alias of DoctrineBundle master was previously 1.0.x-dev, but it was adding new features. So it has been released as 1.1.0 instead. This will allow people starting with the next Symfony 2.1 release to benefit from the DoctrineBundle improvements done in the last 6 months.

Another PR for 2.2 is coming