Adapt security collector template name to webprofiler conventions
Fixed metadata serialization
Merge branch '2.0' into 2.1

* 2.0:
  Fixed metadata serialization
[Validator] fixed metadata serialization
Merge branch '2.1' into 2.2

* 2.1:
  [Validator] fixed metadata serialization
  Fixed metadata serialization
Merge branch '2.2' into 2.3

* 2.2:
  [Validator] fixed metadata serialization
  Fixed metadata serialization
Merge branch '2.3'

* 2.3:
  [Validator] fixed metadata serialization
  Fixed metadata serialization
added trusted hosts check
replaced deprecated Twig features
[Intl] Updated stubs to reflect ICU 51.2
Merge branch '2.0' into 2.1

* 2.0:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
Merge branch '2.1' into 2.2

* 2.1:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Request.php
Merge branch '2.2' into 2.3

* 2.2:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Merge branch '2.3'

* 2.3:
  added trusted hosts check
updated CHANGELOG for 2.2.5
update CONTRIBUTORS for 2.2.5
updated VERSION for 2.2.5
bumped Symfony version to 2.2.6
updated CHANGELOG for 2.3.3
updated VERSION for 2.3.3