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
fixed jstree scrollbar
increased default size of the left panel to avoid line return in switch block with french translations
Fixed loclaization of numbers in forms
Corrected unit test
Corrected number field in price collection
Fixed CS
Fixed CS
Corrected copyright
Merge branch 'fix/number_localization' into 1.1

Conflicts:
	src/Pim/Bundle/CatalogBundle/Resources/config/attribute_types.yml