Update composer.json
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2

Conflicts:
	composer.json
composer fix
tagging
export all entries that matches the current filtering, not only the 10 visible on the adminlist page
Merge branch '2.2' of git://github.com/Kunstmaan/KunstmaanAdminListBundle into 2.2

* '2.2' of git://github.com/Kunstmaan/KunstmaanAdminListBundle:
  tagging
exportwithfiltersandsortparams
Merge branch 'master' into 2.2

* master:
  exportwithfiltersandsortparams
  export all entries that matches the current filtering, not only the 10 visible on the adminlist page
  "sensio/framework-extra-bundle": "2.2.*"
  Fix symfony requirement
  Start of going to Symfony 2.2
  Update Changelog.md
  use glyph icons for listactions & itemactions
  Fixed some typos and duplicate text
  all in one document + Controller doc update
  more doc tweaks
  Typo fixes, text tweaks and Filters doc
  Create an AdminList Configuration
  minor docs for Controller
  Added some generator information

Conflicts:
	composer.json
fix dbal export
Merge branch '2.2' of github.com:Kunstmaan/KunstmaanAdminListBundle into 2.2

* '2.2' of github.com:Kunstmaan/KunstmaanAdminListBundle:
  exportwithfiltersandsortparams
  export all entries that matches the current filtering, not only the 10 visible on the adminlist page
  "sensio/framework-extra-bundle": "2.2.*"
  Fix symfony requirement
  Start of going to Symfony 2.2
  Update Changelog.md
  use glyph icons for listactions & itemactions
  Fixed some typos and duplicate text
  all in one document + Controller doc update
  more doc tweaks
  Typo fixes, text tweaks and Filters doc
  Create an AdminList Configuration
  minor docs for Controller
  Added some generator information
make the em accessible in the admin list configuration
Merge pull request #69 from Kunstmaan/feature/make-em-accessible-in-configuration

make the em accessible in the admin list configuration
Merge branch 'master' into 2.2

* master:
  Update README.md
  Revert "Update composer.json"
  Update composer.json
  change classname removeFilter to removeThisFilter for ie9
  added adjusted html and functionality for sortable styling
  set $em to protected add refactored getQueryBuilder method to overwrite creation of the QueryBuilder
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
  make the em accessible in the admin list configuration
  fix dbal export
  exportwithfiltersandsortparams
  export all entries that matches the current filtering, not only the 10 visible on the adminlist page
  tagging
  composer fix
  Update composer.json

Conflicts:
	composer.json