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).
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
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.1.6
fixed 2.1.6 composer.lock file
Add description about the upgrade of app/appKernel.php
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
updated VENDORS for 2.1.7
updated VENDORS for 2.1.7
fixed .gitignore to be more specific about exclusions
added missing branch-alias in composer file