Merge branch 'master' of https://github.com/wouterbeek/ontologies

Conflicts:
	debug_project.pl
	index.pl