fix macro bug in CL calc_kp_descriptor
Merge branch 'master' of https://github.com/occqoo/3dmm_final

Conflicts:
	sift.cl
remove unused print