Merge pull request #982 from akeneo/fix/attribute_option

Added constraint on attributeOption
Corrected bug whene importing options with bad atttributes
Merge branch '1.0' into 1.1