symfony >=2.1.0,<2.3.0
Merge remote-tracking branch 'origin/2.2'

* origin/2.2:
  composer fix
  composer.json updated

Conflicts:
	composer.json
Merge pull request #2 from Kunstmaan/master

symfony >=2.1.0,<2.3.0