SSDP
Merge branch 'master' of github.com:Kagamine/CenaPlus

Conflicts:
	CenaPlus.Client/CenaPlus.Client.csproj