Update composer.json
Merge branch 'master' into 2.2

* master:
  changed the font for the brand name back to open sans
  changed css to put the button on the same line as the header
  remove the format option from the toolbar in ckeditor
  Update docs for bundles site
  table overflow fix
  renamed filter at to filter on
  warning fix
  Update composer.json
  Update composer.json
  added the right classes to the warnings when requesting your password
  tree fix
  deleted console.log
  auto open the first level of the tree
  tree element state on search, login user icon, font-weight brand css fixes
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
lock versions
merge with master
added jquery_form js
needed for password reset
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2

* master:
  add Request parameter
  "monolog/monolog": "1.4.*@dev"
  remove 'handler'
  dependencies
  "friendsofsymfony/user-bundle": "dev-master"
  I have a good feeling about this one
  how about this?
  let's try this then
  latest fos/user-bundle
  Fix symfony requirement
  Start of Symfony 2.2

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

symfony >=2.1.0,<2.3.0
Add permission creator service
add force option to the permission creator service
Merge pull request #211 from Kunstmaan/feature/2.2-permission-creator-service

Add permission creator service
Make it configurable to show the topmenu in sidebar

Sometimes it may be good to show the topmenu item in the sidebar …
especially if you manage multiple websites in one backend, so that you
know which website you are currently editing.
(cherry picked from commit a11819a031e4bca78d334a432e58186028a90fd0)

Conflicts:
	Resources/views/Default/sidebar.html.twig
merge with master
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 it configurable to show the topmenu in sidebar
  add force option to the permission creator service
  Add permission creator service
  needed for password reset
  added jquery_form js
  merge with master
  lock versions
  Update composer.json

Conflicts:
	composer.json