Merge branch 'master' of git@github.com:syl10/HNXC_WMS.git

Conflicts:
	WMS/WMS.csproj