Added framework config option: trusted_hosts
Merge branch '2.3'

* 2.3:
  Backport issue 426 / PR 429 to branch 2.2
  updated VENDORS for 2.2.10
  updated VENDORS for 2.2.9

Conflicts:
	app/config/config_dev.yml
Fixed the path to config.php in the readme file
minor #605 Fixed the path to config.php in the readme file (jaspernbrouwer)

This PR was squashed before being merged into the master branch (closes #605).

Discussion
----------

Fixed the path to config.php in the readme file

I think the title says it all.

Commits
-------

415f7d8 Fixed the path to config.php in the readme file
feature #585 Added framework config option: trusted_hosts (pulzarraider)

This PR was merged into the master branch.

Discussion
----------

Added framework config option: trusted_hosts

Commits
-------

01b6ed3 Added framework config option: trusted_hosts
Merge branch '2.4'

* 2.4:
  updated min stability to beta
  updated VENDORS for 2.4.0-BETA1
Merge branch '2.4'

* 2.4:
  bumped 2.4 to stable
  updated VENDORS for 2.4.0-RC1
  updated to FrameworkExtraBundle 3.0 (examples updated as well)
  backported #585
  Added config to force Symfony to use native session handler by default
bumped Symfony version to 2.5@dev
moved generator bundle from require to require-dev in composer deps
Merge branch '2.4'

* 2.4:
  Fixed PHPUnit doc URL
  make htaccess deny in src and app work with apache 2.4
moved some dev settings to parameters.yml
feature #603 moved some dev settings to parameters.yml (kriswallsmith)

This PR was squashed before being merged into the 2.4-dev branch (closes #603).

Discussion
----------

moved some dev settings to parameters.yml

So developers can enable or disable this stuff.

Commits
-------

f40a391 moved some dev settings to parameters.yml
Merge branch '2.4'

* 2.4:
  tweaked README
  Allow Doctrine 2.4 to be installed
Move Acme demo bundle to sensio DistributionBundle
feature #643 Move Acme demo bundle to sensio DistributionBundle (romainneutron)

This PR was merged into the 2.4-dev branch.

Discussion
----------

Move Acme demo bundle to sensio DistributionBundle

See https://github.com/symfony/symfony-standard/issues/639
Merge https://github.com/sensiolabs/SensioDistributionBundle/pull/119 before this one

Commits
-------

eb5d496 Move Acme demo bundle to sensio DistributionBundle
updated deps
added PHP 5.5 and 5.6 to travis config
Move Acme demo bundle configuration to sensio DistributionBundle
feature #645 Move Acme demo bundle configuration to sensio DistributionBundle (romainneutron)

This PR was squashed before being merged into the 2.4-dev branch (closes #645).

Discussion
----------

Move Acme demo bundle configuration to sensio DistributionBundle

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| License       | MIT

This is related to https://github.com/sensiolabs/SensioDistributionBundle/pull/120

Commits
-------

0d8d160 Move Acme demo bundle configuration to sensio DistributionBundle
Switch to "apnet/layout-bundle" : "~3.0"