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
Update standard_layout.html.twig
Fix issue with JMSDiExtraBundle
Merge pull request #1213 from ralf57/master

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

Conflicts:
	composer.json