Switched to 0.1.4 version of BatchBundle
Merge branch '1.0' into maintenance/1.0_batch_update
Merge branch '1.0' into maintenance/1.0_batch_update
Removed CustomEntityBundle

Conflicts:

	CHANGELOG.md
	UPGRADE-1.1.md
Corrected routing
Merge branch 'fix/completeness' into maintenance/1.0_backports
Merge branch 'feature/nice_installer_errors' into maintenance/1.0_backports
Merge branch '1.0' into maintenance/1.0_backports
Added constraint on attributeOption
t push
Merge branch 'maintenance/1.0_backports' of github.com:akeneo/pim-community-dev into maintenance/1.0_backports
Corrected bug whene importing options with bad atttributes
Add phpunit dependency on pim-dev
Add dependency to phpcs
Add phpmd dependencies on dev environment
Fix phpunit binary used
fixed jstree scrollbar
increased default size of the left panel to avoid line return in switch block with french translations
PIM-2521: Avoid to load all attributes in grid column configuration [Performance issue]
PIM-2557 Fix grid pagination display on small screens

Conflicts:
	src/Pim/Bundle/UIBundle/Resources/public/css/pim.less
Avoid flushing the DocumentManager when flushing versions