Add Categories and Groups references
Lazy loaded collection from a set of ids
Fixes criteria on initialization
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-2163 Fixed value creation on mass edit of attribute values
Merge branch 'master' into bugfix/pim-2163-2

Conflicts:
	src/Pim/Bundle/EnrichBundle/MassEditAction/EditCommonAttributes.php
Update EditCommonAttributes.php
PIM-2164 Remove the deprecated fallback property of locale
PIM-2165: Remove useless app/entities directory
Add a branch alias for dev-master
PIM-2172: Remove app/emails and its check during install
PIM-2127 : ensure that catalog bundle is loaded before grid bundle
PIM-2127 : add hydrator interface
PIM-2127 : add ORm result record hydrator