Modification du decrypt
Merge branch 'origin/master'

Conflicts:
	GeneratorNET/GeneratorNET/GeneratorNETServer.csproj