tweak layout
Fix navbar layout issue in IE8
Fixed dependencies for 2.1 branch
Merge pull request #1197 from jvandesande/Composer2.1

Fixed dependencies for 2.1 branch
fixed jQuery file reference

jquery-1.8.0.js was revered but only jquery-1.8.3.js exists
Update standard_layout.html.twig
Merge pull request #1198 from sstok/patch-1

fixed jQuery file reference
Fix issue with JMSDiExtraBundle
Fix for "delete" action not working with Sf2.2
Merge remote branch 'origin/develop'
Fix deprecated call
Fixed the KnpMenuBundle requirement

There is no reason to forbid stable versions of the bundle.
Fixes #1205
Merge pull request #1212 from stof/patch-1

Fixed the KnpMenuBundle requirement
Merge pull request #1213 from ralf57/master

Fix navbar layout issue in IE8
Fix toggle regression
Merge branch '2.1'

Conflicts:
	composer.json
Added isXmlHttp check
Update README.md

add clarifications for Admin model
Merge pull request #1220 from freelancer37/patch-1

Update README.md
Merge pull request #1221 from WesleyVanOpdorp/XmlHttpDeleteAction

Added isXmlHttp check