Add an array properties field to Attribute entity for storing custom properties
Simplify attribute custom property definition
Remove magic getters and setters for attribute properties and use get/setProperty instead
Fix an issue with checkbox state in attribute form
Update changelog
Merge branch '1.0' into PIM-2074
Merge branch '1.0' into PIM-2074
PIM-2164 Remove the deprecated fallback property of locale
Merge branch 'master' into PIM-2164
Update changelog
Merge pull request #820 from akeneo/PIM-2164

PIM-2164 Remove the deprecated fallback property of locale
Merge branch 'master' into PIM-2074
Update changelog
Fixes PMD
Merge branch 'master' of github.com:akeneo/pim-community-dev
Fix typo in job creation success message
Merge pull request #830 from akeneo/PIM-2074

PIM-2074 Simplify the creation of custom attribute properties
Fix style and phpdoc
Merge branch 'master' into mongo/grid-filter

Conflicts:
	CHANGELOG.md
	src/Pim/Bundle/CatalogBundle/Doctrine/ReferencedCollection.php
	src/Pim/Bundle/DataGridBundle/Extension/Pager/MongoDbOdm/Pager.php