Merge branch 'master' into develop
updated the composer install command to reflect changes in Composer
Merge branch '2.2' into 2.3

* 2.2:
  Fix some annotates
  [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
  [HttpKernel] remove unneeded strtoupper
  updated the composer install command to reflect changes in Composer

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
	src/Symfony/Component/Locale/Locale.php
	src/Symfony/Component/Locale/README.md
	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
Merge branch '2.3'

* 2.3:
  fixed phpdoc
  Fix some annotates
  [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
  [HttpKernel] remove unneeded strtoupper
  updated the composer install command to reflect changes in Composer

Conflicts:
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
[Filesystem] introduced new Exception base classes
[Filesystem] removed getPath() on Exceptions and cleaned up CS and error messages
Merge remote-tracking branch 'symfony/master' into develop

Conflicts:
	README.md
	src/main/php/ehough/filesystem/Filesystem.php
	src/main/php/ehough/filesystem/exception/IOException.php
Fixed typos
updated version to 2.5
Merge remote-tracking branch 'symfony/master' into develop

Conflicts:
	composer.json
	src/main/php/ehough/filesystem/Filesystem.php
Merge branch 'develop'