Start of going to Symfony 2.2
no dev-master dependencies
Merge pull request #16 from Kunstmaan/feature/symf22

Feature/symf22
Merge branch 'master' into sherlock

* master:
  no dev-master dependencies
  Start of going to Symfony 2.2

Conflicts:
	composer.json