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
Merge branch '2.1'

* 2.1:
  Add description about the upgrade of app/appKernel.php
  fixed 2.1.6 composer.lock file
  updated VENDORS for 2.1.6

Conflicts:
	composer.lock
update Swiftmailer dep
updated VENDORS for 2.2.0-BETA1
Update monolog-bundle dependency to 2.2.*

Dependency on the old monolog bundle is causing a <1.3 version of
monolog to be installed, which is causing breakage because that
version does not implement the PSR-3 interface yet. 
merged branch igorw/patch-1 (PR #471)

This PR was merged into the master branch.

Commits
-------

65c5b2a Update monolog-bundle dependency to 2.2.*

Discussion
----------

Update monolog-bundle dependency to 2.2.*

Dependency on the old monolog bundle is causing a <1.3 version of
monolog to be installed, which is causing breakage because that
version does not implement the PSR-3 interface yet. 
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
Merge branch '2.1'

* 2.1:
  fixed security example configuration for the /_internal prefix
  Updated year range in LICENSE
  updated vendors to dev branches
  updated VENDORS for 2.0.21
Updated DoctrineBundle to 1.1.*
Updated the DoctrineBundle version
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
merged branch stof/patch-2 (PR #474)

This PR was merged into the master branch.

Commits
-------

143a6a2 Updated the DoctrineBundle version

Discussion
----------

Updated the DoctrineBundle version

We need to use 1.2.x for Symfony 2.2
updated VENDORS for 2.1.7