added request->uri to exception message "No site available for the current request" for better debugging
escaped uri to avoid xss
Added PHP 5.5 to .travis.yml
Merge pull request #198 from pulzarraider/patch-1

Added PHP 5.5 to .travis.yml
fixed flash message
Merge pull request #201 from rmzamora/setFlash-patch

fixed flash message
Merge pull request #197 from simonchrz/master

added request->uri to exception message "No site available for the current request"
Updating cmf_routing configuration key

To reflect changes from 2.3
Adding an update 2.1 to 2.2 file
Fixing regression from PR #83 on SonataBlockBundle
Fixing unit tests from previous commit (5e8aef3f8071ee15db39adb3732d57d4e99bccc5)
The migrate-block-name-setting command has been renamed to migrate-block-setting and now also removes orientation option on sonata.page.block.container blocks
Fixing issue with multisite urls & removing unused service
Update base_layout.html.twig

Fix navbar alignment of checkbox and button.
Merge pull request #206 from Sillycone/patch-1

Update base_layout.html.twig
fix translation keys
Fix exception if the block options cannot be resolved
Merge branch 'master' into remove_inline_edition

Conflicts:
	Admin/BlockAdmin.php
deprecated inline edition, enable block creation from the backend