Fix php doc for ProductBuilder::__construct
Fix some php documentation in many classes
Fix php doc in CustomEntityBundle
Add some php doc on DemoBundle
Fix php doc on flexible entity bundle and grid bundle
Add/Fix php doc on ImportExportBundle
PIM-1401 Fixed displayed conversion unit fields for a given channel

In fact, one field should be displayed for each metric attributes (and
not one field per metric family). This allows to define two different
conversion units for two metric attributes that are using the same
metric family.
Merge branch 'master' into feature/pim-1401
Force data_type to data_decimal for Metric filter
Add more tests on Currency filter
Add UT for completeness filter
Added metric values in demo fixtures
PIM-1401 Fixed typo
Fixed convert metric feature description
Merge pull request #548 from akeneo/feature/pim-1401

PIM-1401 Fixed displayed conversion unit fields for a given channel
PIM-1614 : add number attributes
PIM-1641 : add computer family in demo data
PIM-1641 : add some demo products
PIM-1641 : update bap version to get the field property fix
(filtering/sorting on number) and ensure that step execution exists
before to use it
Merge branch 'master' into PIM-1641

Conflicts:
	composer.lock
	src/Pim/Bundle/DemoBundle/Resources/config/installer/demo_dev/attributes.yml
	src/Pim/Bundle/DemoBundle/Resources/config/installer/demo_dev/products.yml