merge
Merge branch 'master' of http://github.com/vGichar/WPChatServer

Conflicts:
	MvcApplication1.v12.suo
	MvcApplication1/App_Data/OwnerUserItemContext-20140715140243.mdf
	MvcApplication1/App_Data/OwnerUserItemContext-20140715140243_log.ldf
	MvcApplication1/App_Data/RoomItemContext-20140715153916.mdf
	MvcApplication1/App_Data/RoomItemContext-20140715153916_log.ldf
	MvcApplication1/Hubs/OwnerUserHub.cs
	MvcApplication1/bin/MvcApplication1.dll
	MvcApplication1/bin/MvcApplication1.pdb
	MvcApplication1/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	MvcApplication1/obj/Debug/MvcApplication1.dll
	MvcApplication1/obj/Debug/MvcApplication1.pdb