Merge branch 'master' of https://github.com/papabear550/biometrics_server

Conflicts:
	biometrics_server/biometrics_server/frmConnect.cs