Set Input Stream ecoding to UTF-8
Merge branch 'master' of https://github.com/nikolakg/EAPSocialOntology

Conflicts:
	nbactions.xml
The update the Ontology with Pellet and embeded ontology file in war