Update composer.json
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
composer fix
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
tagging
fixes_media
fix add subform validation
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2

* master:
  change dev-master dependency to * for adminbundle
  Fix symfony requirement
  Start of going to Symfony 2.2

Conflicts:
	composer.json
Require correct FileHandler class
Update MediaManager.php

Oops
Merge branch 'master' into 2.2

* master:
  Update README.md
  Added missing use statement in Helper\MediaManager
Symfony 2.2 and Kunstmaan bundles 2.2.8.* dependency