Integration of the options
Merge branch 'pcap.Net' of github.com:LudovicT/Grid-Mapper into pcap.Net

Conflicts:
	GridMapper/GridMapper/Execution/Execution.cs