Added Naming and more testing

Now with even more asserts!
committing conflicts!!!

Conflicts:
	AIM/AIM.v12.suo
	AIM/AIM/AIM.Client.Entities/bin/Release/AIM.Client.Entities.dll
	AIM/AIM/AIM.Client.Entities/bin/Release/AIM.Client.Entities.pdb
	AIM/AIM/AIM.Client.Entities/obj/Release/AIM.Client.Entities.dll
	AIM/AIM/AIM.Client.Entities/obj/Release/AIM.Client.Entities.pdb
	AIM/AIM/AIM.ConsoleClient/bin/Release/AIM.Client.Entities.dll
	AIM/AIM/AIM.ConsoleClient/bin/Release/AIM.Client.Entities.pdb
	AIM/AIM/AIM.ConsoleClient/bin/Release/AIM.ConsoleClient.exe
	AIM/AIM/AIM.ConsoleClient/bin/Release/AIM.ConsoleClient.pdb
	AIM/AIM/AIM.ConsoleClient/bin/Release/AIM.Service.Core.dll
	AIM/AIM/AIM.ConsoleClient/bin/Release/AIM.Service.Core.pdb
	AIM/AIM/AIM.ConsoleClient/bin/Release/AIM.Service.Entities.dll
	AIM/AIM/AIM.ConsoleClient/bin/Release/AIM.Service.Entities.pdb
	AIM/AIM/AIM.ConsoleClient/obj/Release/AIM.ConsoleClient.exe
	AIM/AIM/AIM.ConsoleClient/obj/Release/AIM.ConsoleClient.pdb
	AIM/AIM/AIM.Service.Administrative/bin/Release/AIM.Service.Core.dll
	AIM/AIM/AIM.Service.Administrative/bin/Release/AIM.Service.Core.pdb
	AIM/AIM/AIM.Service.Administrative/bin/Release/AIM.Service.Entities.dll
	AIM/AIM/AIM.Service.Administrative/bin/Release/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Service.Administrative/obj/Release/AIM.Service.Core.dll
	AIM/AIM/AIM.Service.Administrative/obj/Release/AIM.Service.Core.pdb
	AIM/AIM/AIM.Service.Entities/bin/Release/AIM.Service.Entities.dll
	AIM/AIM/AIM.Service.Entities/bin/Release/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Service.Entities/obj/Release/AIM.Service.Entities.dll
	AIM/AIM/AIM.Service.Entities/obj/Release/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Client.Entities.dll
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Client.Entities.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.ConsoleClient.exe
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.ConsoleClient.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Service.Core.dll
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Service.Core.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Service.Entities.dll
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Web.Admin.Tests.dll
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Web.Admin.Tests.pdb
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Web.Admin.dll
	AIM/AIM/AIM.Web.Admin.Tests/bin/Release/AIM.Web.Admin.pdb
	AIM/AIM/AIM.Web.Admin.Tests/obj/Release/AIM.Web.Admin.Tests.dll
	AIM/AIM/AIM.Web.Admin.Tests/obj/Release/AIM.Web.Admin.Tests.pdb
	AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Core.dll
	AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Core.pdb
	AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Entities.dll
	AIM/AIM/AIM.Web.Admin/bin/AIM.Service.Entities.pdb
	AIM/AIM/AIM.Web.Admin/bin/AIM.Web.Admin.dll
	AIM/AIM/AIM.Web.Admin/bin/AIM.Web.Admin.pdb
	AIM/AIM/AIM.Web.Admin/obj/Release/AIM.Web.Admin.dll
	AIM/AIM/AIM.Web.Admin/obj/Release/AIM.Web.Admin.pdb