Start of going to Symfony 2.2
Fix symfony requirement
change dev-master dependency to * for adminbundle
Merge remote-tracking branch 'origin/master' into feature/symf22

* origin/master:
  bugfix getMediaForUrl
  fix filehelper issue
Merge branch 'master' into feature/symf22

* master:
  return FileHandler as default when no handler has been found
Merge pull request #96 from Kunstmaan/feature/symf22

Feature/symf22
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