Sync
Merge branch 'master' of https://github.com/Puces-R/Prototype

Conflicts:
	Puces-R/Puces-R/obj/Debug/Puces-R.csproj.FileListAbsolute.txt
Merge branch 'master' of https://github.com/Puces-R/Prototype