Merge branch 'master' into OSNCC

Conflicts:
	CCRec-Full.pdf
merge
add the last paragraph of related work, add pseudocode, change Fig number