Symfony 2.2 dependency
Merge branch 'master' into symfony-2.3

* master:
  Symfony 2.2 dependency

Conflicts:
	composer.json