changes from local second time
Merge branch 'master' of https://github.com/chandrasen/DropNet

Conflicts:
	DropNet/Client/Client.cs