change
Merge branch 'master' of https://github.com/pgemeo/WZNTServices

Conflicts:
	WZNTService/DbManager.cs
change