Fix symfony requirement
no dev-master dependencies
Merge remote-tracking branch 'origin/master' into feature/symf22

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

Conflicts:
	composer.json
Merge pull request #46 from Kunstmaan/feature/symf22

Feature/symf22