edit
Merge branch 'master' of github.com:Vongo/GLHF

Conflicts:
	ProcesseurXML/main.cpp
Merge branch 'master' of github.com:Vongo/GLHF