Merge remote-tracking branch 'origin/ResMap'

Conflicts:
	Syntec Developer/Controls/ResmapTable.cs