partial edit
Merge branch 'master' of
ssh://git@github.com/cntn02/Semantic-document-base.git

Conflicts:
	autocomplete.php
	edit_ontology.php
implement ajax call to query for keyphrase relation