fix db-import.py for the new schema with three levels of relevance
Merge remote-tracking branch 'origin/master' into www