update
Merge branch 'master' of https://github.com/a157147899/fitband

Conflicts:
	FitBand.suo
	oband.Common/bin/Debug/oband.Common.dll
	oband.Common/bin/Debug/oband.Common.pdb
	oband.Common/bin/Debug/oband.Contract.dll
	oband.Common/bin/Debug/oband.Contract.pdb

	oband.Common/obj/Debug/oband.Common.csprojResolveAssemblyReference.cache
	oband.Common/obj/Debug/oband.Common.dll
	oband.Common/obj/Debug/oband.Common.pdb
	oband.Contract/bin/Debug/oband.Contract.dll
	oband.Contract/bin/Debug/oband.Contract.pdb
	oband.Contract/obj/Debug/oband.Contract.dll
	oband.Contract/obj/Debug/oband.Contract.pdb
	oband.Service/bin/Debug/oband.Contract.dll
	oband.Service/bin/Debug/oband.Contract.pdb
	oband.Service/bin/Debug/oband.Service.dll
	oband.Service/bin/Debug/oband.Service.pdb

	oband.Service/obj/Debug/oband.Service.csprojResolveAssemblyReference.cache
	oband.Service/obj/Debug/oband.Service.dll
	oband.Service/obj/Debug/oband.Service.pdb
	oband/bin/oband.Common.dll
	oband/bin/oband.Common.pdb
	oband/bin/oband.Contract.dll
	oband/bin/oband.Contract.pdb
	oband/bin/oband.Service.dll
	oband/bin/oband.Service.pdb
	oband/bin/oband.dll
	oband/bin/oband.pdb
	oband/oband.Publish.xml
	oband/obj/Debug/Package/PackageTmp/bin/System.Net.Http.Formatting.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Net.Http.WebRequest.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Net.Http.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Web.Helpers.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Web.Http.WebHost.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Web.Http.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Web.Mvc.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Web.Razor.dll

	oband/obj/Debug/Package/PackageTmp/bin/System.Web.WebPages.Deployment.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Web.WebPages.Razor.dll
	oband/obj/Debug/Package/PackageTmp/bin/System.Web.WebPages.dll
	oband/obj/Debug/Package/PackageTmp/bin/oband.Common.dll
	oband/obj/Debug/Package/PackageTmp/bin/oband.Common.pdb
	oband/obj/Debug/Package/PackageTmp/bin/oband.Contract.dll
	oband/obj/Debug/Package/PackageTmp/bin/oband.Contract.pdb
	oband/obj/Debug/Package/PackageTmp/bin/oband.Service.dll
	oband/obj/Debug/Package/PackageTmp/bin/oband.Service.pdb
	oband/obj/Debug/Package/PackageTmp/bin/oband.dll
	oband/obj/Debug/Package/PackageTmp/bin/oband.pdb
	oband/obj/Debug/oband.csproj.FileListAbsolute.txt
	oband/obj/Debug/oband.csprojResolveAssemblyReference.cache
	oband/obj/Debug/oband.dll
	oband/obj/Debug/oband.pdb