Merge branch 'master' of https://github.com/hydai/HOE

Conflicts:
	src/special_product.cpp
Merge sp.cpp