dug fixed
Merge branch 'master' of https://github.com/kse-jp/RM-3000
#13 Fixed
Merge branch 'master' of https://github.com/kse-jp/RM-3000
#46
Merge branch 'master' of https://github.com/kse-jp/RM-3000
bug fixed
Merge branch 'master' of https://github.com/kse-jp/RM-3000
bug Fixed
setting up
setting up2
Merge branch 'master' of https://github.com/kse-jp/RM-3000

Conflicts:
	RM-3000/Forms/Measurement/frmMeasureController.Designer.cs
	RM-3000/Forms/Measurement/frmMeasureSetting.Designer.cs
	bin/System/MeasureSetting.xml
	bin/System/TagChannelRelation.xml