merge
Merge branch 'master' of github.com:JiapengHuang/SPP

Conflicts:
	cone_speckle_Jiapeng/cone_speckle.c
Merge
Merge branch 'master' of github.com:JiapengHuang/SPP
Merge branch 'master' of github.com:JiapengHuang/SPP

Conflicts:
	cone_speckle_Jiapeng/cone_speckle.c