resolve conflit
Merge branch 'master' of https://github.com/csongfr/OGP

Conflicts:
	source/TestServeurPlugins/UnitTest1.cs
Merge branch 'master' of https://github.com/csongfr/OGP
Correction App.config