sdasd

sdasdsa
Merge branch 'master' of https://github.com/smss123/Whats

Conflicts:
	XpremaWhats/Xaina/MainFrm.Designer.cs
	XpremaWhats/Xaina/MainFrm.cs
	XpremaWhats/Xaina/MainFrm.resx
	XpremaWhats/Xaina/Properties/licenses.licx
	XpremaWhats/Xaina/bin/Debug/Xaina.vshost.exe.manifest
	XpremaWhats/Xaina/obj/Debug/Xaina.csproj.FileListAbsolute.txt
	XpremaWhats/Xaina/obj/Debug/Xaina.csproj.GenerateResource.Cache
	XpremaWhats/Xaina/obj/Debug/Xaina.csprojResolveAssemblyReference.cache
	XpremaWhats/XpremaWhats.v12.suo
Merge branch 'master' of https://github.com/smss123/Whats.git