Minor_edits
Merge branch 'master' of https://github.com/calipho-sib/controlled-vocabulary

Conflicts:
	cv_family.txt