updated VENDORS for 2.0.19
updated vendors to dev branches
updated VENDORS for 2.1.4
Add a note to the 2.0 -> 2.1 upgrade guide about completing all steps before running composer install

When upgrading from 2.0 -> 2.1, composer.phar will fail with  a runtime
exception when attempting to generate the autoload bootstrap file if
the install is attempted before updating the existing files
(config.yml, app.php etc).
merged branch gregholland/master (PR #452)

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

Commits
-------

1a4a470 Add a note to the 2.0 -> 2.1 upgrade guide about completing all steps before running composer install

Discussion
----------

Add note to the 2.1 upgrade doc

When upgrading from 2.0 -> 2.1, composer.phar will fail with a runtime exception when attempting to generate the autoload bootstrap file if the install is attempted before updating the existing files as per the guide (config.yml, app.php etc).
[DemoBundle][DemoExtension] remove unused use
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
merged branch franmomu/patch-1 (PR #458)

This PR was merged into the master branch.

Commits
-------

6d3bf22 [DemoBundle][DemoExtension] remove unused use

Discussion
----------

[DemoBundle][DemoExtension] remove unused use
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
Merge branch '2.1'

* 2.1:
  added a warning about a security issue when using the _internal route
  updated VENDORS for 2.1.5
  updated vendors to dev branches
  updated VENDORS for 2.0.20
  added default configuration for trusted proxies
  Add a note to the 2.0 -> 2.1 upgrade guide about completing all steps before running composer install
  updated VENDORS for 2.1.4
  updated vendors to dev branches
  updated VENDORS for 2.0.19

Conflicts:
	app/config/config.yml
	composer.lock
removed the _internal routes in the default routing file as it does not exist anymore