Merge branch 'master' into import-scenarios

Conflicts:
	src/Pim/Bundle/CatalogBundle/Entity/Repository/ProductAttributeRepository.php
PIM-838 : Add behat scenario to test message when there is unsaved changes
PIM-838 : Add unsaved changes behavior to variant-group
PIM-838 : Add behat scenario for unsaved changes features
Change the product enabled switcher
Merge branch 'master' into PIM-1122
Merge branch 'master' of github.com:akeneo/pim-community-dev

Conflicts:
	features/Context/Page/Base/Base.php
	features/variant-group/edit_variant.feature
Merge pull request #344 from akeneo/PIM-838

PIM-838 : Add behat scenario to test message when there is unsaved changes
Remove the StepExecution from the read calls
Merge branch 'master' into bugfix/increment-write-count
Updated file writer tests
Merge pull request #341 from akeneo/bugfix/increment-write-count

Bugfix/increment write count
Enhance scenario filter products per category
Improve UI for metric unit select
Merge branch 'master' into import-scenarios

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Reader/CsvReader.php
Fix unit select height issue in firefox
Fix variant page mappping for behat test
Merge branch 'master' into PIM-1122
Merge pull request #345 from akeneo/PIM-1122

Improve UI for metric attribute value
Fix typo