Merge remote-tracking branch 'origin/master' into np_page_importer_photo

Conflicts:
	PhotoFun.suo
	PhotoFun/PhotoFun.csproj
	PhotoFun/bin/PhotoFun.dll
	PhotoFun/bin/PhotoFun.pdb
	PhotoFun/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PhotoFun/obj/Debug/PhotoFun.csproj.FileListAbsolute.txt
	PhotoFun/obj/Debug/PhotoFun.csprojResolveAssemblyReference.cache
	PhotoFun/obj/Debug/PhotoFun.dll
	PhotoFun/obj/Debug/PhotoFun.pdb