OK
Merge branch 'master' of https://github.com/markm11/plcsmsinterface

Conflicts:
	win.control.cpp