pulling jack's code
Merge branch 'master'

Conflicts:
	Collabrify-wp8/Collabrify-wp8/Bin/Debug/Collabrify-wp8.dll
	Collabrify-wp8/Collabrify-wp8/Bin/Debug/Collabrify-wp8.pdb
	Collabrify-wp8/Collabrify-wp8/Bin/Debug/Collabrify_wp8_Debug_AnyCPU.xap
	Collabrify-wp8/Collabrify-wp8/Collabrify/CollabrifyClient.cs
	Collabrify-wp8/Collabrify-wp8/MainPage.xaml.cs
	Collabrify-wp8/Collabrify-wp8/obj/Debug/App.g.cs
	Collabrify-wp8/Collabrify-wp8/obj/Debug/App.g.i.cs

	Collabrify-wp8/Collabrify-wp8/obj/Debug/Collabrify-wp8.csproj.GenerateResource.Cache

	Collabrify-wp8/Collabrify-wp8/obj/Debug/Collabrify-wp8.csprojResolveAssemblyReference.cache
	Collabrify-wp8/Collabrify-wp8/obj/Debug/Collabrify-wp8.dll
	Collabrify-wp8/Collabrify-wp8/obj/Debug/Collabrify-wp8.pdb

	Collabrify-wp8/Collabrify-wp8/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Collabrify-wp8/Collabrify-wp8/obj/Debug/MainPage.g.cs
	Collabrify-wp8/Collabrify-wp8/obj/Debug/XapCacheFile.xml