Latest Updates
Fixed conflicts

Conflicts:
	Server/Server/Commands.cs
	TCP Device/TCP Device/Program.cs
Db