analysis & ontology update
Merge remote-tracking branch 'origin/master'

Conflicts:
	HandsOn/Grupo12/ontology/Ontology.owl
Merge pull request #251 from JoseRodriguezBueno/master

OK