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
PIM-2332: Move SegmentationTreeBundle from BAP to PIM
PIM-2332: Update namespaces
PIM-2332: Rename extension and bundle files
PIM-2332: Remove useless oro files
PIM-2332: Add SegmentationTreeBundle
PIM-2332: Move AbstractSegment into Category
PIM-2332: Move SegmentRepository code to CategoryRepository
PIM-2332: Remove useless class and update others
PIM-2332: Remove parent call
PIM-2332 : remove deprecated files
PIM-2332 : disable sgementation bundle from oro/platform
PIM-2332 : use the pim segmenation bundle in assetic configuration file
Merge branch '1.0' into maintenance/1.0_backports