BugFix
Merge branch 'master' of https://github.com/dmazak/WireOnPOS

Conflicts:
	WireOnPOS/WireOnPOS/frmMain.Designer.vb