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
use self.version for Kunstmaan Bundles
Merge branch 'master' into symfony-2.3

* master:
  use self.version for Kunstmaan Bundles
  Symfony 2.2 and Kunstmaan bundles 2.2.8.* dependency
  Update MediaManager.php
  Require correct FileHandler class
  fix add subform validation
  fixes_media
  tagging
  composer fix
  Update composer.json

Conflicts:
	composer.json