Revert "Start of Start of going to Symfony 2.2"

This reverts commit 3327247aa1467ba498cac281c2bf4ba49e228c9c.
Merge remote-tracking branch 'origin/master' into feature/symf22

* origin/master:
  Revert "Start of Start of going to Symfony 2.2"

Conflicts:
	composer.json