Solving merge conflicts
Merge branch 'master' of https://github.com/Vongo/GLHF

Conflicts:
	ProcesseurXML/xml.output