remove haystack dependency
fix haystack dependency
Merge branch 'master' into issue/1527/enhance_product_options

Conflicts:
	setup.py