Remove useless double backslash
Rename datagrid.yml to grid.yml for compatibility with OroDataGridBundle
Update with last beta version
More precise location for the registering
Add mandatory group type
Merge branch 'master' into new-grid

Conflicts:
	DependencyInjection/PimIcecatDemoExtension.php