diff --git a/eShopOnContainers-MobileApps.sln b/eShopOnContainers-MobileApps.sln
new file mode 100644
index 000000000..ac4f693a1
--- /dev/null
+++ b/eShopOnContainers-MobileApps.sln
@@ -0,0 +1,515 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}"
+	ProjectSection(SolutionItems) = preProject
+		docker-compose.yml = docker-compose.yml
+		global.json = global.json
+		NuGet.config = NuGet.config
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{F61357CE-1CC2-410E-8776-B16EEBC98EB8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A857AD10-40FF-4303-BEC2-FF1C58D5735E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Core", "src\Mobile\eShopOnContainers\eShopOnContainers.Core\eShopOnContainers.Core.csproj", "{65116D1C-145B-4693-ABDA-F0FB6F425191}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Droid", "src\Mobile\eShopOnContainers\eShopOnContainers.Droid\eShopOnContainers.Droid.csproj", "{62DBB163-9CA9-4818-B48B-13233DF37C24}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.iOS", "src\Mobile\eShopOnContainers\eShopOnContainers.iOS\eShopOnContainers.iOS.csproj", "{6EEB23DC-7063-4444-9AF8-90DF24F549C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Windows", "src\Mobile\eShopOnContainers\eShopOnContainers.Windows\eShopOnContainers.Windows.csproj", "{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Code", "Shared Code", "{778289CA-31F7-4464-8C2A-612EE846F8A7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{9CC7814B-72A6-465B-A61C-57B512DEE303}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{B7B1D395-4E06-4036-BE86-C216756B9367}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.UnitTests", "src\Mobile\eShopOnContainers\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj", "{F7B6A162-BC4D-4924-B16A-713F9B0344E7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunner.Droid", "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.Droid\eShopOnContainers.TestRunner.Droid.csproj", "{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunner.Windows", "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.Windows\eShopOnContainers.TestRunner.Windows.csproj", "{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunner.iOS", "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.iOS\eShopOnContainers.TestRunner.iOS.csproj", "{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
+		Ad-Hoc|ARM = Ad-Hoc|ARM
+		Ad-Hoc|iPhone = Ad-Hoc|iPhone
+		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+		Ad-Hoc|x64 = Ad-Hoc|x64
+		Ad-Hoc|x86 = Ad-Hoc|x86
+		AppStore|Any CPU = AppStore|Any CPU
+		AppStore|ARM = AppStore|ARM
+		AppStore|iPhone = AppStore|iPhone
+		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+		AppStore|x64 = AppStore|x64
+		AppStore|x86 = AppStore|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|ARM.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|x64.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.AppStore|x86.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|ARM.Build.0 = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|x64.Build.0 = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Debug|x86.Build.0 = Debug|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|ARM.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|ARM.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|iPhone.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|x64.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|x64.Build.0 = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|x86.ActiveCfg = Release|Any CPU
+		{65116D1C-145B-4693-ABDA-F0FB6F425191}.Release|x86.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|ARM.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|ARM.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|iPhone.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|x64.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|x64.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|x86.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.AppStore|x86.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|ARM.Build.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|x64.Build.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|x86.Build.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|ARM.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|ARM.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|ARM.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|iPhone.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|x64.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|x64.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|x64.Deploy.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|x86.ActiveCfg = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|x86.Build.0 = Release|Any CPU
+		{62DBB163-9CA9-4818-B48B-13233DF37C24}.Release|x86.Deploy.0 = Release|Any CPU
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.AppStore|ARM.ActiveCfg = AppStore|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.AppStore|x64.ActiveCfg = AppStore|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.AppStore|x86.ActiveCfg = AppStore|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|ARM.ActiveCfg = Debug|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|iPhone.Build.0 = Debug|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|x64.ActiveCfg = Debug|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|x86.ActiveCfg = Debug|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|ARM.ActiveCfg = Release|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|iPhone.ActiveCfg = Release|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|iPhone.Build.0 = Release|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|x64.ActiveCfg = Release|iPhone
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|x86.ActiveCfg = Release|iPhone
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|Any CPU.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|ARM.Build.0 = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|iPhone.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|iPhone.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|iPhone.Deploy.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|x64.ActiveCfg = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|x64.Build.0 = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|x64.Deploy.0 = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|x86.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|x86.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Ad-Hoc|x86.Deploy.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|Any CPU.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|Any CPU.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|Any CPU.Deploy.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|ARM.ActiveCfg = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|ARM.Build.0 = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|ARM.Deploy.0 = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|iPhone.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|iPhone.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|iPhone.Deploy.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|iPhoneSimulator.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|iPhoneSimulator.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|iPhoneSimulator.Deploy.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|x64.ActiveCfg = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|x64.Build.0 = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|x64.Deploy.0 = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|x86.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|x86.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.AppStore|x86.Deploy.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|ARM.ActiveCfg = Debug|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|ARM.Build.0 = Debug|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|ARM.Deploy.0 = Debug|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|iPhone.ActiveCfg = Debug|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|iPhone.Build.0 = Debug|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|iPhone.Deploy.0 = Debug|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|x64.ActiveCfg = Debug|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|x64.Build.0 = Debug|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|x64.Deploy.0 = Debug|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|x86.ActiveCfg = Debug|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|x86.Build.0 = Debug|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|x86.Deploy.0 = Debug|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|Any CPU.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|ARM.ActiveCfg = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|ARM.Build.0 = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|ARM.Deploy.0 = Release|ARM
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|iPhone.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x64.ActiveCfg = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x64.Build.0 = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x64.Deploy.0 = Release|x64
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.ActiveCfg = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.Build.0 = Release|x86
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.Deploy.0 = Release|x86
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|ARM.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|x64.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|x86.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|x64.Build.0 = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|x86.Build.0 = Debug|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|ARM.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|iPhone.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|x64.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|x64.Build.0 = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|x86.ActiveCfg = Release|Any CPU
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|x86.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|ARM.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|ARM.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|iPhone.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|x64.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|x64.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|x86.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.AppStore|x86.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|x64.Build.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|x86.Build.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|ARM.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|ARM.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|iPhone.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|x64.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|x64.Deploy.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|x86.Build.0 = Release|Any CPU
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Release|x86.Deploy.0 = Release|Any CPU
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|Any CPU.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|ARM.Build.0 = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|iPhone.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|x64.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|x64.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|x64.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|x86.ActiveCfg = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|x86.Build.0 = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Ad-Hoc|x86.Deploy.0 = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|Any CPU.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|Any CPU.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|Any CPU.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|ARM.ActiveCfg = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|ARM.Build.0 = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|ARM.Deploy.0 = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|iPhone.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|iPhone.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|iPhone.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|iPhoneSimulator.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|x64.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|x64.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|x64.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|x86.ActiveCfg = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|x86.Build.0 = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.AppStore|x86.Deploy.0 = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|ARM.ActiveCfg = Debug|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|ARM.Build.0 = Debug|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|ARM.Deploy.0 = Debug|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|iPhone.ActiveCfg = Debug|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|iPhone.Build.0 = Debug|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|iPhone.Deploy.0 = Debug|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|x64.ActiveCfg = Debug|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|x64.Build.0 = Debug|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|x64.Deploy.0 = Debug|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|x86.ActiveCfg = Debug|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|x86.Build.0 = Debug|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|x86.Deploy.0 = Debug|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|Any CPU.ActiveCfg = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|ARM.ActiveCfg = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|ARM.Build.0 = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|ARM.Deploy.0 = Release|ARM
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|iPhone.ActiveCfg = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|x64.ActiveCfg = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|x64.Build.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|x64.Deploy.0 = Release|x64
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|x86.ActiveCfg = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|x86.Build.0 = Release|x86
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|x86.Deploy.0 = Release|x86
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.AppStore|ARM.ActiveCfg = AppStore|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.AppStore|x64.ActiveCfg = AppStore|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.AppStore|x86.ActiveCfg = AppStore|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|ARM.ActiveCfg = Debug|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|iPhone.Build.0 = Debug|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|x64.ActiveCfg = Debug|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|x86.ActiveCfg = Debug|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|ARM.ActiveCfg = Release|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|iPhone.ActiveCfg = Release|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|iPhone.Build.0 = Release|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|x64.ActiveCfg = Release|iPhone
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|x86.ActiveCfg = Release|iPhone
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{F61357CE-1CC2-410E-8776-B16EEBC98EB8} = {932D8224-11F6-4D07-B109-DA28AD288A63}
+		{65116D1C-145B-4693-ABDA-F0FB6F425191} = {778289CA-31F7-4464-8C2A-612EE846F8A7}
+		{62DBB163-9CA9-4818-B48B-13233DF37C24} = {9CC7814B-72A6-465B-A61C-57B512DEE303}
+		{6EEB23DC-7063-4444-9AF8-90DF24F549C0} = {9CC7814B-72A6-465B-A61C-57B512DEE303}
+		{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B} = {9CC7814B-72A6-465B-A61C-57B512DEE303}
+		{778289CA-31F7-4464-8C2A-612EE846F8A7} = {F61357CE-1CC2-410E-8776-B16EEBC98EB8}
+		{9CC7814B-72A6-465B-A61C-57B512DEE303} = {F61357CE-1CC2-410E-8776-B16EEBC98EB8}
+		{B7B1D395-4E06-4036-BE86-C216756B9367} = {A857AD10-40FF-4303-BEC2-FF1C58D5735E}
+		{F7B6A162-BC4D-4924-B16A-713F9B0344E7} = {B7B1D395-4E06-4036-BE86-C216756B9367}
+		{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1} = {B7B1D395-4E06-4036-BE86-C216756B9367}
+		{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F} = {B7B1D395-4E06-4036-BE86-C216756B9367}
+		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} = {B7B1D395-4E06-4036-BE86-C216756B9367}
+	EndGlobalSection
+EndGlobal
diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln
new file mode 100644
index 000000000..df3f9dd3a
--- /dev/null
+++ b/eShopOnContainers-ServicesAndWebApps.sln
@@ -0,0 +1,396 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}"
+	ProjectSection(SolutionItems) = preProject
+		docker-compose.yml = docker-compose.yml
+		global.json = global.json
+		NuGet.config = NuGet.config
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{91CF7717-08AB-4E65-B10E-0B426F01E2E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web Apps", "Web Apps", "{E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Catalog", "Catalog", "{326A7FB3-5295-468C-A4FE-67DCB823E1E5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basket", "Basket", "{BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ordering", "Ordering", "{0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Basket.API", "src\Services\Basket\Basket.API\Basket.API.xproj", "{2110CBB0-3B38-4EE4-A743-DF6968D80D90}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Catalog.API", "src\Services\Catalog\Catalog.API\Catalog.API.xproj", "{42681D9D-750A-4DF7-BD9F-9292CFD5C253}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.API", "src\Services\Ordering\Ordering.API\Ordering.API.xproj", "{231226CE-690B-4979-8870-9A79D80928E2}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Domain", "src\Services\Ordering\Ordering.Domain\Ordering.Domain.xproj", "{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A857AD10-40FF-4303-BEC2-FF1C58D5735E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{EF0337F2-ED00-4643-89FD-EE10863F1870}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Test", "test\Services\Ordering.Test\Ordering.Test.xproj", "{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.WebMVC", "src\Web\WebMVC\eShopOnContainers.WebMVC.xproj", "{F0333D8E-0B27-42B7-B2C6-78F3657624E2}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.WebSPA", "src\Web\WebSPA\eShopOnContainers.WebSPA\eShopOnContainers.WebSPA.xproj", "{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Application", "src\Services\Ordering\Ordering.Application\Ordering.Application.xproj", "{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Infrastructure", "src\Services\Ordering\Ordering.Infrastructure\Ordering.Infrastructure.xproj", "{95F1F07C-4D92-4742-BD07-E5B805AAB651}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
+		Ad-Hoc|ARM = Ad-Hoc|ARM
+		Ad-Hoc|iPhone = Ad-Hoc|iPhone
+		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+		Ad-Hoc|x64 = Ad-Hoc|x64
+		Ad-Hoc|x86 = Ad-Hoc|x86
+		AppStore|Any CPU = AppStore|Any CPU
+		AppStore|ARM = AppStore|ARM
+		AppStore|iPhone = AppStore|iPhone
+		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+		AppStore|x64 = AppStore|x64
+		AppStore|x86 = AppStore|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|x64.ActiveCfg = Release|Any CPU
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90}.Release|x86.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|ARM.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|x64.ActiveCfg = Release|Any CPU
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253}.Release|x86.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Release|ARM.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Release|x64.ActiveCfg = Release|Any CPU
+		{231226CE-690B-4979-8870-9A79D80928E2}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|x86.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|x64.ActiveCfg = Release|Any CPU
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|x86.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|x64.ActiveCfg = Release|Any CPU
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|x86.ActiveCfg = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|x64.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|x86.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|x64.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|x86.Build.0 = Debug|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|ARM.Build.0 = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|iPhone.Build.0 = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|x64.ActiveCfg = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|x64.Build.0 = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|x86.ActiveCfg = Release|Any CPU
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|x86.Build.0 = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|x64.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.AppStore|x86.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|x64.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Debug|x86.Build.0 = Debug|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|ARM.Build.0 = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|iPhone.Build.0 = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|x64.ActiveCfg = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|x64.Build.0 = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|x86.ActiveCfg = Release|Any CPU
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}.Release|x86.Build.0 = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|x64.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.AppStore|x86.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|ARM.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|x64.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Debug|x86.Build.0 = Debug|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|ARM.ActiveCfg = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|ARM.Build.0 = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|iPhone.Build.0 = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x64.ActiveCfg = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x64.Build.0 = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x86.ActiveCfg = Release|Any CPU
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{91CF7717-08AB-4E65-B10E-0B426F01E2E8} = {932D8224-11F6-4D07-B109-DA28AD288A63}
+		{E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} = {932D8224-11F6-4D07-B109-DA28AD288A63}
+		{326A7FB3-5295-468C-A4FE-67DCB823E1E5} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
+		{BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
+		{0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
+		{2110CBB0-3B38-4EE4-A743-DF6968D80D90} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}
+		{42681D9D-750A-4DF7-BD9F-9292CFD5C253} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5}
+		{231226CE-690B-4979-8870-9A79D80928E2} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
+		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
+		{EF0337F2-ED00-4643-89FD-EE10863F1870} = {A857AD10-40FF-4303-BEC2-FF1C58D5735E}
+		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
+		{F0333D8E-0B27-42B7-B2C6-78F3657624E2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
+		{9842DB3A-1391-48C7-A49C-2FABD0A18AC2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
+		{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
+		{95F1F07C-4D92-4742-BD07-E5B805AAB651} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
+	EndGlobalSection
+EndGlobal
diff --git a/eShopOnContainers.sln b/eShopOnContainers.sln
index c567a1f5b..88575bbc3 100644
--- a/eShopOnContainers.sln
+++ b/eShopOnContainers.sln
@@ -36,8 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A857AD10-4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{EF0337F2-ED00-4643-89FD-EE10863F1870}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Test", "test\Services\Ordering.Test\Ordering.Test.xproj", "{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.WebMVC", "src\Web\WebMVC\eShopOnContainers.WebMVC.xproj", "{F0333D8E-0B27-42B7-B2C6-78F3657624E2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Core", "src\Mobile\eShopOnContainers\eShopOnContainers.Core\eShopOnContainers.Core.csproj", "{65116D1C-145B-4693-ABDA-F0FB6F425191}"
@@ -204,32 +202,6 @@ Global
 		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|x64.ActiveCfg = Release|Any CPU
 		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76}.Release|x86.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|x64.ActiveCfg = Release|Any CPU
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967}.Release|x86.ActiveCfg = Release|Any CPU
 		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
 		{F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
@@ -828,54 +800,54 @@ Global
 		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x64.Build.0 = Release|Any CPU
 		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x86.ActiveCfg = Release|Any CPU
 		{95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x86.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.Build.0 = Debug|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.Build.0 = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.ActiveCfg = Release|Any CPU
-		{A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.Build.0 = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|x64.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.AppStore|x86.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|x64.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Debug|x86.Build.0 = Debug|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|ARM.Build.0 = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|iPhone.Build.0 = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|x64.ActiveCfg = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|x64.Build.0 = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|x86.ActiveCfg = Release|Any CPU
+		{621E7211-58D0-45FD-9600-1CB490BD930E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -892,7 +864,6 @@ Global
 		{231226CE-690B-4979-8870-9A79D80928E2} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
 		{F5598DCB-6DDE-4661-AD9D-A55612DA7E76} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
 		{EF0337F2-ED00-4643-89FD-EE10863F1870} = {A857AD10-40FF-4303-BEC2-FF1C58D5735E}
-		{A0AFC432-3846-4B4E-BD8E-3C8C896F4967} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
 		{F0333D8E-0B27-42B7-B2C6-78F3657624E2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
 		{65116D1C-145B-4693-ABDA-F0FB6F425191} = {778289CA-31F7-4464-8C2A-612EE846F8A7}
 		{62DBB163-9CA9-4818-B48B-13233DF37C24} = {9CC7814B-72A6-465B-A61C-57B512DEE303}
diff --git a/global.json b/global.json
index c5112dcd4..1fe3e7546 100644
--- a/global.json
+++ b/global.json
@@ -3,7 +3,8 @@
     "src",
     "test",
     "src/Services/Ordering",
-    "src/Web"
+    "src/Web",
+    "src/Services/Catalog"
   ],
 
   "sdk": {
diff --git a/src/Mobile/Images/AndroidEmulator.png b/src/Mobile/Images/AndroidEmulator.png
new file mode 100644
index 000000000..ed449cd29
Binary files /dev/null and b/src/Mobile/Images/AndroidEmulator.png differ
diff --git a/src/Mobile/Images/Auth.png b/src/Mobile/Images/Auth.png
new file mode 100644
index 000000000..7a8591348
Binary files /dev/null and b/src/Mobile/Images/Auth.png differ
diff --git a/src/Mobile/Images/Catalog.png b/src/Mobile/Images/Catalog.png
new file mode 100644
index 000000000..5a93d0f2b
Binary files /dev/null and b/src/Mobile/Images/Catalog.png differ
diff --git a/src/Mobile/Images/Filter.png b/src/Mobile/Images/Filter.png
new file mode 100644
index 000000000..8b1d12f40
Binary files /dev/null and b/src/Mobile/Images/Filter.png differ
diff --git a/src/Mobile/Images/MacAgent.png b/src/Mobile/Images/MacAgent.png
new file mode 100644
index 000000000..6f5cb99f0
Binary files /dev/null and b/src/Mobile/Images/MacAgent.png differ
diff --git a/src/Mobile/Images/OrderDetail.png b/src/Mobile/Images/OrderDetail.png
new file mode 100644
index 000000000..93072f736
Binary files /dev/null and b/src/Mobile/Images/OrderDetail.png differ
diff --git a/src/Mobile/Images/Preview.png b/src/Mobile/Images/Preview.png
new file mode 100644
index 000000000..7b63a484f
Binary files /dev/null and b/src/Mobile/Images/Preview.png differ
diff --git a/src/Mobile/Images/Profile.png b/src/Mobile/Images/Profile.png
new file mode 100644
index 000000000..1e3b86a45
Binary files /dev/null and b/src/Mobile/Images/Profile.png differ
diff --git a/src/Mobile/Images/Settings.png b/src/Mobile/Images/Settings.png
new file mode 100644
index 000000000..8f7661f71
Binary files /dev/null and b/src/Mobile/Images/Settings.png differ
diff --git a/src/Mobile/Images/ShoppingCart.png b/src/Mobile/Images/ShoppingCart.png
new file mode 100644
index 000000000..f3b46c958
Binary files /dev/null and b/src/Mobile/Images/ShoppingCart.png differ
diff --git a/src/Mobile/Images/Updates.png b/src/Mobile/Images/Updates.png
new file mode 100644
index 000000000..db0db0174
Binary files /dev/null and b/src/Mobile/Images/Updates.png differ
diff --git a/src/Mobile/README.md b/src/Mobile/README.md
new file mode 100644
index 000000000..30f840967
--- /dev/null
+++ b/src/Mobile/README.md
@@ -0,0 +1,107 @@
+#eShopOnContainers
+
+eShopOnContainers is a reference app whose imagined purpose is to serve the mobile workforce of a fictitious company that sells products. The app allow to manage the catalog, view products, manage the basket and the orders.
+
+<img src="Images/Preview.png" alt="eShopOnContainers" Width="320" />
+
+###Try it out:
+You can download and build the app's source as-is, preconfigured to consume our Azure service instance. 
+
+###Supported platforms: iOS, Android and Windows
+
+###The app architecture consists of two parts:
+  1. A Xamarin.Forms mobile app for iOS, Android and Windows.
+  2. A .NET Web API-backed Entity Framework based Azure Mobile Service for data.
+
+**The Azure Mobile Service does not need to be deployed by you.** There is already an instance of the service up and running in Azure, and the mobile app is configured by default to consume that service instance. We've included the code for the service so that you may run your own service instance on Azure if you'd like. 
+
+##Xamarin.Forms App (eShopOnContainers)
+
+This project exercises the following platforms, frameworks or features:
+
+* Xamarin.Forms
+  * XAML
+  * Bindings
+  * Converters
+  * Central Styles
+  * Custom Renderers
+  * Animations
+  * IoC
+  * Messaging Center
+  * Custom Controls
+  * Cross Plugins
+  * XFGloss
+* xUnit Tests
+* Azure Mobile Services
+  * C# backend
+  * WebAPI
+  * Entity Framework
+  * Identity Server 4
+
+##Three platforms
+The app targets **three** platforms:
+
+* iOS
+* Android
+* Universal Windows Platform (UWP)
+    * UWP supported only in Visual Studio, not Xamarin Studio
+
+
+As of 29/11/2016, eShopOnContainers features **89.2% code share** (7.2% iOS / 16.7% Android / 8.7% Windows).
+
+## Requirements
+* [Visual Studio __2015__](https://www.visualstudio.com/en-us/products/vs-2015-product-editions.aspx) (14.0 or higher) to compile C# 6 langage features (or Visual Studio MacOS)
+* Xamarin add-ons for Visual Studio (available via the Visual Studio installer)
+* __Visual Studio Community Edition is fully supported!__
+
+## Setup
+
+#### [1. Ensure the Xamarin platform is installed](http://developer.xamarin.com/guides/cross-platform/getting_started/installation/)
+
+#### 2. Ensure Xamarin are updated
+Xamarin will periodically automatically check for updates. You can also manually check for updates.
+
+<img src="Images/Updates.png" alt="Ensure Xamarin are updated" Width="600" />
+
+### 3. Project Setup
+
+Restore NuGet packages for the project.
+
+### 4. Ensure Android Emulator is installed
+You can use any Android emulator although it is highly recommended to use an x86 based version.
+
+<img src="Images/AndroidEmulator.png" alt="Visual Studio Android Emulator" Width="600" />
+
+**Note**: The Visual Studio Android Emulator cannot run well inside a virtual machine or over Remote Desktop or VNC since it relies on virtualization and OpenGL. 
+
+To deploy and debug the application on a physical device, refer to these [link](https://developer.xamarin.com/guides/android/deployment,_testing,_and_metrics/debug-on-device/).
+
+### 5. Ensure Mac connection
+To set up the Mac host, you must enable communication between the Xamarin extension for Visual Studio and your Mac.
+
+<img src="Images/MacAgent.png" alt="Connect with a Mac" Width="600" />
+
+## Screens
+
+The app has the following screens:
+
+* a auth screen
+* a catalog list
+* a profile section with a order list
+* a readonly order detail screen
+* a customizable basket
+* a checkout screen
+
+<img src="Images/Auth.png" alt="Login" Width="210" />
+<img src="Images/Catalog.png" alt="Catalog" Width="210" />
+<img src="Images/Filter.png" alt="Filter catalog" Width="210" />
+<img src="Images/Profile.png" alt="Profile" Width="210" />
+<img src="Images/OrderDetail.png" alt="Order details" Width="210" />
+<img src="Images/ShoppingCart.png" alt="Basket" Width="210" />
+<img src="Images/Settings.png" alt="Settings" Width="210" />
+
+## Clean and Rebuild
+If you see build issues when pulling updates from the repo, try cleaning and rebuilding the solution.
+
+## Copyright and license
+* Code and documentation copyright 2016 Microsoft Corp. Code released under the [MIT license](https://opensource.org/licenses/MIT).
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs
index d6523392d..c4aea5cd7 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs
@@ -9,16 +9,27 @@ namespace eShopOnContainers
 {
     public partial class App : Application
     {
+        public bool UseMockServices { get; set; }
+
         public App()
         {
             InitializeComponent();
 
+            InitApp();
+
             if (Device.OS == TargetPlatform.Windows)
             {
                 InitNavigation();
             }
         }
 
+        private void InitApp()
+        {
+            UseMockServices = true;
+
+            ViewModelLocator.Instance.UpdateDependencies(UseMockServices);
+        }
+
         private Task InitNavigation()
         {
             var navigationService = ViewModelLocator.Instance.Resolve<INavigationService>();
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/WebViewNavigationBehavior.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/WebViewNavigationBehavior.cs
new file mode 100644
index 000000000..07ae80120
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/WebViewNavigationBehavior.cs
@@ -0,0 +1,49 @@
+using System.Windows.Input;
+using Xamarin.Forms;
+
+namespace eShopOnContainers.Core.Behaviors
+{
+    public class WebViewNavigationBehavior : Behavior<WebView>
+    {
+        private VisualElement _element;
+
+        public static readonly BindableProperty NavigateCommandProperty =
+                BindableProperty.Create("NavigateCommand", typeof(ICommand),
+                    typeof(WebViewNavigationBehavior), default(ICommand),
+                    BindingMode.OneWay, null);
+
+        public ICommand NavigateCommand
+        {
+            get { return (ICommand)GetValue(NavigateCommandProperty); }
+            set { SetValue(NavigateCommandProperty, value); }
+        }
+
+        protected override void OnAttachedTo(WebView bindable)
+        {
+            _element = bindable;
+            bindable.Navigating += OnWebViewNavigating;
+            bindable.BindingContextChanged += OnBindingContextChanged;
+        }
+
+        protected override void OnDetachingFrom(WebView bindable)
+        {
+            _element = null;
+            BindingContext = null;
+            bindable.Navigating -= OnWebViewNavigating;
+            bindable.BindingContextChanged -= OnBindingContextChanged;
+        }
+
+        private void OnBindingContextChanged(object sender, System.EventArgs e)
+        {
+            BindingContext = _element?.BindingContext;
+        }
+
+        private void OnWebViewNavigating(object sender, WebNavigatingEventArgs e)
+        {
+            if (NavigateCommand != null && NavigateCommand.CanExecute(e.Url))
+            {
+                NavigateCommand.Execute(e.Url);
+            }
+        }
+    }
+}
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/BindablePicker.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/BindablePicker.cs
index 5699f5b2d..07f592e14 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/BindablePicker.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/BindablePicker.cs
@@ -23,6 +23,7 @@ namespace eShopOnContainers.Core.Controls
                 }
 
                 var index = 0;
+
                 foreach (var item in ItemsSource)
                 {
                     if (index == SelectedIndex)
@@ -30,6 +31,7 @@ namespace eShopOnContainers.Core.Controls
                         SelectedItem = item;
                         break;
                     }
+
                     index++;
                 }
             };
@@ -62,6 +64,7 @@ namespace eShopOnContainers.Core.Controls
             if (ItemsSource != null)
             {
                 var index = 0;
+
                 foreach (var item in ItemsSource)
                 {
                     string strItem = item?.ToString();
@@ -73,6 +76,7 @@ namespace eShopOnContainers.Core.Controls
                         selectedIndex = index;
                         break;
                     }
+
                     index++;
                 }
             }
@@ -102,12 +106,10 @@ namespace eShopOnContainers.Core.Controls
         {
             var boundPicker = (BindablePicker)bindable;
 
-            if (boundPicker.ItemSelected != null)
-            {
-                boundPicker.ItemSelected(boundPicker, new SelectedItemChangedEventArgs(newValue));
-            }
+            boundPicker.ItemSelected?.Invoke(boundPicker, 
+                new SelectedItemChangedEventArgs(newValue));
 
             boundPicker.InternalUpdateSelectedIndex();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs
index 6a1832fa1..419ca5082 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs
@@ -6,7 +6,7 @@ namespace eShopOnContainers.Core.Converters
 {
     public class ItemsToHeightConverter : IValueConverter
     {
-        private const int ItemHeight = 144;
+        private const int ItemHeight = 156;
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
index d942bc439..792c10deb 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
@@ -1,11 +1,53 @@
 namespace eShopOnContainers.Core
 {
-    public static class GlobalSetting
+    public class GlobalSetting
     {
-        public const string RegisterWebsite = "http://104.40.62.65/Account/Register";
+        private string _baseEndpoint;
+        private static readonly GlobalSetting _instance = new GlobalSetting();
 
-        public const string CatalogEndpoint = "http://104.40.62.65:5101/";
+        public GlobalSetting()
+        {
+            BaseEndpoint = "http://104.40.62.65";
+        }
 
-        public const string BasketEndpoint = "http://104.40.62.65:5103/";
+        public static GlobalSetting Instance
+        {
+            get { return _instance; }
+        }
+
+        public string BaseEndpoint
+        {
+            get { return _baseEndpoint; }
+            set
+            {
+                _baseEndpoint = value;
+                UpdateEndpoint(_baseEndpoint);
+            }
+        }
+
+        public string RegisterWebsite { get; set; }
+
+        public string CatalogEndpoint { get; set; }
+
+        public string OrdersEndpoint { get; set; }
+
+        public string BasketEndpoint { get; set; }
+
+        public string IdentityEndpoint { get; set; }
+
+        public string LogoutEndpoint { get; set; }
+
+        public string IdentityCallback { get; set; }
+
+        private void UpdateEndpoint(string baseEndpoint)
+        {
+            RegisterWebsite = string.Format("{0}/Account/Register", baseEndpoint);
+            CatalogEndpoint = string.Format("{0}:5101", baseEndpoint);
+            OrdersEndpoint = string.Format("{0}:5102", baseEndpoint);
+            BasketEndpoint = string.Format("{0}:5103", baseEndpoint);
+            IdentityEndpoint = string.Format("{0}:5105/connect/authorize", baseEndpoint);
+            LogoutEndpoint = string.Format("{0}:5105/connect/endsession", baseEndpoint);
+            IdentityCallback = "http://localhost:5003/callback.html";
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/NumericHelper.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/NumericHelper.cs
index 989d359a1..ea4022558 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/NumericHelper.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/NumericHelper.cs
@@ -7,7 +7,7 @@ namespace eShopOnContainers.Core.Helpers
         public static ObservableCollection<int> GetNumericList(int count = 100)
         {
             var result = new ObservableCollection<int>();
-            for (int i = 0; i < count; i++)
+            for (int i = 1; i < count; i++)
             {
                 result.Add(i);
             }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
new file mode 100644
index 000000000..3d2d99134
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
@@ -0,0 +1,41 @@
+using Plugin.Settings;
+using Plugin.Settings.Abstractions;
+
+namespace eShopOnContainers.Core.Helpers
+{
+    /// <summary>
+    /// This is the Settings static class that can be used in your Core solution or in any
+    /// of your client applications. All settings are laid out the same exact way with getters
+    /// and setters. 
+    /// </summary>
+    public static class Settings
+    {
+        private static ISettings AppSettings
+        {
+            get
+            {
+                return CrossSettings.Current;
+            }
+        }
+
+        #region Setting Constants
+
+        private const string AccessToken = "access_token";
+        private static readonly string AccessTokenDefault = string.Empty;
+
+        #endregion
+
+
+        public static string AuthAccessToken
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<string>(AccessToken, AccessTokenDefault);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue<string>(AccessToken, value);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs
index 9b5090e41..c10da754f 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs
@@ -67,11 +67,14 @@ namespace eShopOnContainers.Core.Models.Basket
             get { return _quantity; }
             set
             {
-                _quantity = value;
-                RaisePropertyChanged(() => Quantity);
-                RaisePropertyChanged(() => Total);
+                if (_quantity != value)
+                {
+                    _quantity = value;
+                    RaisePropertyChanged(() => Quantity);
+                    RaisePropertyChanged(() => Total);
 
-                MessagingCenter.Send(this, MessengerKeys.UpdateProduct);
+                    MessagingCenter.Send(this, MessengerKeys.UpdateProduct);
+                }
             }
         }
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/CardType.CS b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/CardType.CS
new file mode 100644
index 000000000..07873e79c
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/CardType.CS
@@ -0,0 +1,8 @@
+namespace eShopOnContainers.Core.Models.Orders
+{
+    public class CardType
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs
index 10712da68..8ec118a24 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs
@@ -3,7 +3,6 @@ using eShopOnContainers.Core.ViewModels.Base;
 using eShopOnContainers.ViewModels.Base;
 using System;
 using System.Collections.ObjectModel;
-using Xamarin.Forms;
 
 namespace eShopOnContainers.Core.Models.Orders
 {
@@ -71,8 +70,6 @@ namespace eShopOnContainers.Core.Models.Orders
                 _quantity = value;
                 RaisePropertyChanged(() => Quantity);
                 RaisePropertyChanged(() => Total);
-
-                MessagingCenter.Send(this, MessengerKeys.UpdateProduct);
             }
         }
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketMockService.cs
index 6bdcf0df5..5a76fc5c2 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketMockService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketMockService.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Xamarin.Forms;
-using System;
 
 namespace eShopOnContainers.Core.Services.Basket
 {
@@ -38,5 +37,15 @@ namespace eShopOnContainers.Core.Services.Basket
 
             return MockCustomBasket;
         }
+
+        public async Task ClearBasketAsync(string guidUser)
+        {
+            await Task.Delay(500);
+
+            if (!string.IsNullOrEmpty(guidUser))
+            {
+                MockCustomBasket.Items.Clear();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
index e5bc66202..979d7188e 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
@@ -18,7 +18,7 @@ namespace eShopOnContainers.Core.Services.Basket
         {
             try
             {
-                UriBuilder builder = new UriBuilder(GlobalSetting.BasketEndpoint);
+                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
 
                 builder.Path = guidUser;
 
@@ -41,7 +41,7 @@ namespace eShopOnContainers.Core.Services.Basket
 
         public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket)
         {
-            UriBuilder builder = new UriBuilder(GlobalSetting.BasketEndpoint);
+            UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
 
             string uri = builder.ToString();
 
@@ -49,5 +49,16 @@ namespace eShopOnContainers.Core.Services.Basket
 
             return result;
         }
+
+        public async Task ClearBasketAsync(string guidUser)
+        {
+            UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
+
+            builder.Path = guidUser;
+
+            string uri = builder.ToString();
+
+             await _requestProvider.DeleteAsync(uri);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs
index 356eb40f7..3c6893773 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs
@@ -7,5 +7,6 @@ namespace eShopOnContainers.Core.Services.Basket
     {
         Task<CustomerBasket> GetBasketAsync(string guidUser);
         Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket);
+        Task ClearBasketAsync(string guidUser);
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs
index fa78f3625..9234e4059 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs
@@ -19,30 +19,44 @@ namespace eShopOnContainers.Core.Services.Catalog
 
         public async Task<ObservableCollection<CatalogItem>> FilterAsync(int catalogBrandId, int catalogTypeId)
         {
-            UriBuilder builder = new UriBuilder(GlobalSetting.CatalogEndpoint);
+            try
+            {
+                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
 
-            builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId);
+                builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId);
 
-            string uri = builder.ToString();
+                string uri = builder.ToString();
 
-            CatalogRoot catalog =
-                    await _requestProvider.GetAsync<CatalogRoot>(uri);
+                CatalogRoot catalog =
+                        await _requestProvider.GetAsync<CatalogRoot>(uri);
 
-            return catalog?.Data?.ToObservableCollection();
+                return catalog?.Data?.ToObservableCollection();
+            }
+            catch
+            {
+                return new ObservableCollection<CatalogItem>();
+            }
         }
 
         public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
         {
-            UriBuilder builder = new UriBuilder(GlobalSetting.CatalogEndpoint);
+            try
+            {
+                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
 
-            builder.Path = "api/v1/catalog/items";
+                builder.Path = "api/v1/catalog/items";
 
-            string uri = builder.ToString();
+                string uri = builder.ToString();
 
-            CatalogRoot catalog = 
-                await _requestProvider.GetAsync<CatalogRoot>(uri);
+                CatalogRoot catalog =
+                    await _requestProvider.GetAsync<CatalogRoot>(uri);
 
-            return catalog?.Data?.ToObservableCollection();
+                return catalog?.Data?.ToObservableCollection();
+            }
+            catch
+            {
+                return new ObservableCollection<CatalogItem>();
+            }
         }
 
         public Task<CatalogItem> GetCatalogItemAsync(string id)
@@ -52,30 +66,44 @@ namespace eShopOnContainers.Core.Services.Catalog
 
         public async Task<ObservableCollection<CatalogBrand>> GetCatalogBrandAsync()
         {
-            UriBuilder builder = new UriBuilder(GlobalSetting.CatalogEndpoint);
+            try
+            {
+                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
 
-            builder.Path = "api/v1/catalog/catalogbrands";
+                builder.Path = "api/v1/catalog/catalogbrands";
 
-            string uri = builder.ToString();
+                string uri = builder.ToString();
 
-            IEnumerable<CatalogBrand> brands =
-                   await _requestProvider.GetAsync<IEnumerable<CatalogBrand>>(uri);
+                IEnumerable<CatalogBrand> brands =
+                       await _requestProvider.GetAsync<IEnumerable<CatalogBrand>>(uri);
 
-            return brands?.ToObservableCollection();
+                return brands?.ToObservableCollection();
+            }
+            catch
+            {
+                return new ObservableCollection<CatalogBrand>();
+            }
         }
 
         public async Task<ObservableCollection<CatalogType>> GetCatalogTypeAsync()
         {
-            UriBuilder builder = new UriBuilder(GlobalSetting.CatalogEndpoint);
+            try
+            {
+                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
 
-            builder.Path = "api/v1/catalog/catalogtypes";
+                builder.Path = "api/v1/catalog/catalogtypes";
 
-            string uri = builder.ToString();
+                string uri = builder.ToString();
 
-            IEnumerable<CatalogType> types =
-                   await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
+                IEnumerable<CatalogType> types =
+                       await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
 
-            return types?.ToObservableCollection();
+                return types?.ToObservableCollection();
+            }
+            catch
+            {
+                return new ObservableCollection<CatalogType>();
+            }
         }
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs
new file mode 100644
index 000000000..134e2ee73
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs
@@ -0,0 +1,9 @@
+namespace eShopOnContainers.Core.Services.Identity
+{
+    public interface IIdentityService
+    {
+        string CreateAuthorizeRequest();
+        string CreateLogoutRequest(string token);
+        string DecodeToken(string token);
+    }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs
new file mode 100644
index 000000000..b6f61c420
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs
@@ -0,0 +1,69 @@
+using IdentityModel.Client;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace eShopOnContainers.Core.Services.Identity
+{
+    public class IdentityService : IIdentityService
+    {
+        public string CreateAuthorizeRequest()
+        {
+            // Create URI to authorize endpoint
+            var authorizeRequest =
+                new AuthorizeRequest(GlobalSetting.Instance.IdentityEndpoint);
+
+            // Dictionary with values for the authorize request
+            var dic = new Dictionary<string, string>();
+            dic.Add("client_id", "xamarin");
+            dic.Add("response_type", "id_token token");
+            dic.Add("scope", "openid profile basket");
+
+            dic.Add("redirect_uri", GlobalSetting.Instance.IdentityCallback);
+            dic.Add("nonce", Guid.NewGuid().ToString("N"));
+
+            // Add CSRF token to protect against cross-site request forgery attacks.
+            var currentCSRFToken = Guid.NewGuid().ToString("N");
+            dic.Add("state", currentCSRFToken);
+
+            var authorizeUri = authorizeRequest.Create(dic);
+
+            return authorizeUri;
+        }
+
+        public string CreateLogoutRequest(string token)
+        {
+            return string.Format("{0}?id_token_hint={1}&post_logout_redirect_uri={2}", 
+                GlobalSetting.Instance.LogoutEndpoint,
+                token,
+                GlobalSetting.Instance.IdentityCallback);
+        }
+
+        public string DecodeToken(string token)
+        {
+            var parts = token.Split('.');
+
+            string partToConvert = parts[1];
+            partToConvert = partToConvert.Replace('-', '+');
+            partToConvert = partToConvert.Replace('_', '/');
+            switch (partToConvert.Length % 4)
+            {
+                case 0:
+                    break;
+                case 2:
+                    partToConvert += "==";
+                    break;
+                case 3:
+                    partToConvert += "=";
+                    break;
+            }
+
+            var partAsBytes = Convert.FromBase64String(partToConvert);
+            var partAsUTF8String = Encoding.UTF8.GetString(partAsBytes, 0, partAsBytes.Count());
+
+            return JObject.Parse(partAsUTF8String).ToString();
+        }
+    }
+}
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs
index 66a723baf..22383fdb1 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs
@@ -1,4 +1,5 @@
-using eShopOnContainers.Core.ViewModels;
+using eShopOnContainers.Core.Helpers;
+using eShopOnContainers.Core.ViewModels;
 using eShopOnContainers.Core.Views;
 using eShopOnContainers.ViewModels.Base;
 using System;
@@ -29,7 +30,10 @@ namespace eShopOnContainers.Services
 
         public Task InitializeAsync()
         {
-            return NavigateToAsync<LoginViewModel>();
+            if(string.IsNullOrEmpty(Settings.AuthAccessToken))
+                return NavigateToAsync<LoginViewModel>();
+            else
+                return NavigateToAsync<MainViewModel>();
         }
 
         public Task NavigateToAsync<TViewModel>() where TViewModel : ViewModelBase
@@ -67,7 +71,7 @@ namespace eShopOnContainers.Services
 
         public virtual Task RemoveLastFromBackStackAsync()
         {
-            var mainPage = CurrentApplication.MainPage as CustomNavigationPage;
+            var mainPage = CurrentApplication.MainPage as CustomNavigationView;
 
             if (mainPage != null)
             {
@@ -80,7 +84,7 @@ namespace eShopOnContainers.Services
 
         public virtual Task RemoveBackStackAsync()
         {
-            var mainPage = CurrentApplication.MainPage as CustomNavigationPage;
+            var mainPage = CurrentApplication.MainPage as CustomNavigationView;
 
             if (mainPage != null)
             {
@@ -100,11 +104,11 @@ namespace eShopOnContainers.Services
 
             if (page is LoginView)
             {
-                CurrentApplication.MainPage = new CustomNavigationPage(page);
+                CurrentApplication.MainPage = new CustomNavigationView(page);
             }
             else
             {
-                var navigationPage = CurrentApplication.MainPage as CustomNavigationPage;
+                var navigationPage = CurrentApplication.MainPage as CustomNavigationView;
 
                 if (navigationPage != null)
                 {
@@ -112,7 +116,7 @@ namespace eShopOnContainers.Services
                 }
                 else
                 {
-                    CurrentApplication.MainPage = new CustomNavigationPage(page);
+                    CurrentApplication.MainPage = new CustomNavigationView(page);
                 }
             }
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs
new file mode 100644
index 000000000..5d63ea9e8
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs
@@ -0,0 +1,13 @@
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+
+namespace eShopOnContainers.Core.Services.Order
+{
+    public interface IOrderService
+    {
+        Task CreateOrderAsync(Models.Orders.Order newOrder);
+        Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync();
+        Task<Models.Orders.Order> GetOrderAsync(int orderId);
+        Task<ObservableCollection<Models.Orders.CardType>> GetCardTypesAsync();
+    }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs
new file mode 100644
index 000000000..4b249fbd0
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs
@@ -0,0 +1,61 @@
+using eShopOnContainers.Core.Extensions;
+using eShopOnContainers.Core.Models.Orders;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace eShopOnContainers.Core.Services.Order
+{
+    public class OrderMockService : IOrderService
+    {
+        private List<Models.Orders.Order> MockOrders = new List<Models.Orders.Order>()
+        {
+            new Models.Orders.Order { SequenceNumber = 123, Total = 56.40M, OrderDate = DateTime.Now, Status = OrderStatus.Delivered, OrderItems = MockOrderItems },
+            new Models.Orders.Order { SequenceNumber = 132, Total = 56.40M, OrderDate = DateTime.Now, Status = OrderStatus.Delivered, OrderItems = MockOrderItems },
+            new Models.Orders.Order { SequenceNumber = 231, Total = 56.40M, OrderDate = DateTime.Now, Status = OrderStatus.Delivered, OrderItems = MockOrderItems },
+        };
+
+        private static List<OrderItem> MockOrderItems = new List<OrderItem>()
+        {
+            new OrderItem { OrderId = Guid.NewGuid(), ProductId = "1", Discount = 15, ProductName = ".NET Bot Blue Sweatshirt (M)", Quantity = 1, UnitPrice = 16.50M },
+            new OrderItem { OrderId = Guid.NewGuid(), ProductId = "3", Discount = 0, ProductName = ".NET Bot Black Sweatshirt (M)", Quantity = 2, UnitPrice = 19.95M }
+        };
+
+        private static List<CardType> MockCardTypes = new List<CardType>()
+        {
+            new CardType { Id = 1, Name = "Amex" },
+            new CardType { Id = 2, Name = "Visa" },
+            new CardType { Id = 3, Name = "MasterCard" },
+        };
+
+        public async Task CreateOrderAsync(Models.Orders.Order newOrder)
+        {
+            await Task.Delay(500);
+
+            MockOrders.Insert(0, newOrder);
+        }
+
+        public async Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync()
+        {
+            await Task.Delay(500);
+
+            return MockOrders.ToObservableCollection();
+        }
+
+        public async Task<Models.Orders.Order> GetOrderAsync(int orderId)
+        {
+            await Task.Delay(500);
+
+            return MockOrders.FirstOrDefault(o => o.SequenceNumber == orderId);
+        }
+
+        public async Task<ObservableCollection<CardType>> GetCardTypesAsync()
+        {
+            await Task.Delay(500);
+
+            return MockCardTypes.ToObservableCollection();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
new file mode 100644
index 000000000..50da93209
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
@@ -0,0 +1,91 @@
+using eShopOnContainers.Core.Services.RequestProvider;
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+
+namespace eShopOnContainers.Core.Services.Order
+{
+    public class OrderService : IOrderService
+    {
+        private readonly IRequestProvider _requestProvider;
+
+        public OrderService(IRequestProvider requestProvider)
+        {
+            _requestProvider = requestProvider;
+        }
+
+        public async Task CreateOrderAsync(Models.Orders.Order newOrder)
+        {
+            UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint);
+
+            builder.Path = "api/v1/orders/new";
+
+            string uri = builder.ToString();
+
+            await _requestProvider.PostAsync(uri, newOrder);
+        }
+
+        public async Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync()
+        {
+            try
+            {
+                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint);
+
+                builder.Path = "api/v1/orders";
+
+                string uri = builder.ToString();
+
+                ObservableCollection<Models.Orders.Order> orders =
+                    await _requestProvider.GetAsync<ObservableCollection<Models.Orders.Order>>(uri);
+
+                return orders;
+            }
+            catch
+            {
+                return new ObservableCollection<Models.Orders.Order>();
+            }
+        }
+
+        public async Task<Models.Orders.Order> GetOrderAsync(int orderId)
+        {
+            try
+            {
+                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint);
+
+                builder.Path = string.Format("api/v1/orders/{0}", orderId);
+
+                string uri = builder.ToString();
+
+                Models.Orders.Order order =
+                    await _requestProvider.GetAsync<Models.Orders.Order>(uri);
+
+                return order;
+            }
+            catch
+            {
+                return new Models.Orders.Order();
+            }
+        }
+
+        public async Task<ObservableCollection<Models.Orders.CardType>> GetCardTypesAsync()
+        {
+            try
+            {
+                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint);
+
+                builder.Path = "api/v1/orders/cardtypes";
+
+                string uri = builder.ToString();
+
+                ObservableCollection<Models.Orders.CardType> cardTypes =
+                    await _requestProvider.GetAsync<ObservableCollection<Models.Orders.CardType>>(uri);
+
+                return cardTypes;
+            }
+            catch
+            {
+                return new ObservableCollection<Models.Orders.CardType>();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs
index 7c36620fa..c5846a001 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs
@@ -13,5 +13,7 @@ namespace eShopOnContainers.Core.Services.RequestProvider
         Task<TResult> PutAsync<TResult>(string uri, TResult data);
 
         Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data);
+
+        Task DeleteAsync(string uri);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs
index dd6a1bce5..3bc4c15e0 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs
@@ -77,6 +77,13 @@ namespace eShopOnContainers.Core.Services.RequestProvider
             return await Task.Run(() => JsonConvert.DeserializeObject<TResult>(responseData, _serializerSettings));
         }
 
+        public async Task DeleteAsync(string uri)
+        {
+            HttpClient httpClient = CreateHttpClient();
+
+            await httpClient.DeleteAsync(uri);
+        }
+
         private HttpClient CreateHttpClient()
         {
             var httpClient = new HttpClient();
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/IUserService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/IUserService.cs
index fac0a47a1..02d310c3a 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/IUserService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/IUserService.cs
@@ -1,12 +1,9 @@
-using eShopOnContainers.Core.Models.Orders;
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace eShopOnContainers.Core.Services.User
 {
     public interface IUserService
     {
         Task<Models.User.User> GetUserAsync();
-        Task<List<Order>> GetOrdersAsync();
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs
index 12c3f8e60..d273e704a 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs
@@ -1,7 +1,4 @@
-using eShopOnContainers.Core.Models.Orders;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace eShopOnContainers.Core.Services.User
 {
@@ -18,31 +15,12 @@ namespace eShopOnContainers.Core.Services.User
             Country = "United States"
         };
 
-        private List<Order> MockOrders = new List<Order>()
-        {
-            new Order { SequenceNumber = 123, Total = 56.40M, OrderDate = DateTime.Now, Status = OrderStatus.Delivered, OrderItems = MockOrderItems },
-            new Order { SequenceNumber = 132, Total = 56.40M, OrderDate = DateTime.Now, Status = OrderStatus.Delivered, OrderItems = MockOrderItems },
-            new Order { SequenceNumber = 231, Total = 56.40M, OrderDate = DateTime.Now, Status = OrderStatus.Delivered, OrderItems = MockOrderItems },
-        };
-
-        private static List<OrderItem> MockOrderItems = new List<OrderItem>()
-        {
-            new OrderItem { OrderId = Guid.NewGuid(), ProductId = "1", Discount = 15, ProductName = ".NET Bot Blue Sweatshirt (M)", Quantity = 1, UnitPrice = 16.50M },
-            new OrderItem { OrderId = Guid.NewGuid(), ProductId = "3", Discount = 0, ProductName = ".NET Bot Black Sweatshirt (M)", Quantity = 2, UnitPrice = 19.95M }
-        };
-
+    
         public async Task<Models.User.User> GetUserAsync()
         {
             await Task.Delay(500);
 
             return MockUser;
         }
-
-        public async Task<List<Order>> GetOrdersAsync()
-        {
-            await Task.Delay(500);
-
-            return MockOrders;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessengerKeys.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessengerKeys.cs
index 25fd28be6..506892520 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessengerKeys.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessengerKeys.cs
@@ -15,6 +15,9 @@
         public const string Filter = "Filter";
 
         // Change selected Tab programmatically
-        public const string ChangeTab = "ChangeTab";
+        public const string ChangeTab = "ChangeTab";   
+        
+        // Logout
+        public const string Logout = "Logout";
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs
index e1c28642a..dd269b659 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs
@@ -7,6 +7,8 @@ using eShopOnContainers.Core.Services.OpenUrl;
 using eShopOnContainers.Core.Services.User;
 using eShopOnContainers.Core.Services.RequestProvider;
 using eShopOnContainers.Core.Services.Basket;
+using eShopOnContainers.Core.Services.Identity;
+using eShopOnContainers.Core.Services.Order;
 
 namespace eShopOnContainers.ViewModels.Base
 {
@@ -37,6 +39,7 @@ namespace eShopOnContainers.ViewModels.Base
             RegisterSingleton<INavigationService, NavigationService>();
             _unityContainer.RegisterType<IOpenUrlService, OpenUrlService>();
             _unityContainer.RegisterType<IRequestProvider, RequestProvider>();
+            _unityContainer.RegisterType<IIdentityService, IdentityService>();
 
             _unityContainer.RegisterType<ICatalogService, CatalogMockService>();
             _unityContainer.RegisterType<IBasketService, BasketMockService>();
@@ -53,28 +56,29 @@ namespace eShopOnContainers.ViewModels.Base
             _unityContainer.RegisterType<SettingsViewModel>();
         }
 
-        public void UpdateServices(bool useMockServices)
+        public void UpdateDependencies(bool useMockServices)
         {
-            if (!useMockServices)
+            if (useMockServices)
             {
                 _unityContainer.RegisterInstance<ICatalogService>(new CatalogMockService());
                 _unityContainer.RegisterInstance<IBasketService>(new BasketMockService());
+                _unityContainer.RegisterInstance<IOrderService>(new OrderMockService());
                 _unityContainer.RegisterInstance<IUserService>(new UserMockService());
 
-                UseMockService = false;
+                UseMockService = true;
             }
             else
             {
                 var requestProvider = Resolve<IRequestProvider>();
                 _unityContainer.RegisterInstance<ICatalogService>(new CatalogService(requestProvider));
                 _unityContainer.RegisterInstance<IBasketService>(new BasketService(requestProvider));
+                _unityContainer.RegisterInstance<IOrderService>(new OrderService(requestProvider));
                 _unityContainer.RegisterInstance<IUserService>(new UserMockService());
 
-                UseMockService = true;
+                UseMockService = false;
             }
         }
-
-
+        
         public T Resolve<T>()
         {
             return _unityContainer.Resolve<T>();
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
index 0ffea52ad..c24f3cbba 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
@@ -1,6 +1,5 @@
 using eShopOnContainers.Core.Models.Basket;
 using eShopOnContainers.Core.Models.Catalog;
-using eShopOnContainers.Core.Models.Orders;
 using eShopOnContainers.Core.Models.User;
 using eShopOnContainers.Core.Services.Basket;
 using eShopOnContainers.Core.Services.User;
@@ -69,10 +68,9 @@ namespace eShopOnContainers.Core.ViewModels
         {
             MessagingCenter.Subscribe<CatalogViewModel, List<BasketItem>>(this, MessengerKeys.UpdateBasket, (sender, arg) =>
             {
-                BadgeCount = arg.Count;
-
                 foreach (var basketItem in arg)
                 {
+                    BadgeCount += basketItem.Quantity;
                     AddBasketItem(basketItem);
                 }
             });
@@ -84,7 +82,7 @@ namespace eShopOnContainers.Core.ViewModels
                 AddCatalogItem(arg);
             });
             
-            MessagingCenter.Subscribe<OrderItem>(this, MessengerKeys.UpdateProduct, (sender) =>
+            MessagingCenter.Subscribe<BasketItem>(this, MessengerKeys.UpdateProduct, (sender) =>
             {
                 ReCalculateTotal();
             });
@@ -126,12 +124,16 @@ namespace eShopOnContainers.Core.ViewModels
         {
             Total = 0;
 
+            if (BasketItems == null)
+            {
+                return;
+            }
+
             foreach (var orderItem in BasketItems)
             {
                 Total += (orderItem.Quantity * orderItem.UnitPrice);
             }
-
-
+            
             _basketService.UpdateBasketAsync(new CustomerBasket
             {
                 BuyerId = _user.GuidUser,
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
index e842f310f..b42fd9b67 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
@@ -11,6 +11,8 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using eShopOnContainers.Core.Models.Basket;
 using System.Collections.Generic;
+using eShopOnContainers.Core.Services.Basket;
+using eShopOnContainers.Core.Services.Order;
 
 namespace eShopOnContainers.Core.ViewModels
 {
@@ -21,10 +23,16 @@ namespace eShopOnContainers.Core.ViewModels
         private User _user;
 
         private IUserService _userService;
+        private IBasketService _basketService;
+        private IOrderService _orderService;
 
-        public CheckoutViewModel(IUserService userService)
+        public CheckoutViewModel(IUserService userService,
+            IBasketService basketService,
+            IOrderService orderService)
         {
+            _basketService = basketService;
             _userService = userService;
+            _orderService = orderService;
         }
 
         public ObservableCollection<BasketItem> OrderItems
@@ -86,10 +94,13 @@ namespace eShopOnContainers.Core.ViewModels
 
         private async void Checkout()
         {
+            await _orderService.CreateOrderAsync(Order);
+            await _basketService.ClearBasketAsync(User.GuidUser);
+            
             await NavigationService.NavigateToAsync<MainViewModel>(new TabParameter { TabIndex = 1 });
             await NavigationService.RemoveLastFromBackStackAsync();
 
-            await DialogService.ShowAlertAsync("Order sent successfully", string.Format("Order {0}", Order.OrderNumber), "Ok");
+            await DialogService.ShowAlertAsync("Order sent successfully!", string.Format("Order {0}", Order.OrderNumber), "Ok");
             await NavigationService.RemoveLastFromBackStackAsync();
         }
 
@@ -124,4 +135,4 @@ namespace eShopOnContainers.Core.ViewModels
             return total;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
index 2381d0958..67a6b4734 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
@@ -1,6 +1,10 @@
-using eShopOnContainers.Core.Services.OpenUrl;
+using eShopOnContainers.Core.Helpers;
+using eShopOnContainers.Core.Services.Identity;
+using eShopOnContainers.Core.Services.OpenUrl;
 using eShopOnContainers.Core.Validations;
+using eShopOnContainers.Core.ViewModels.Base;
 using eShopOnContainers.ViewModels.Base;
+using IdentityModel.Client;
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
@@ -13,17 +17,24 @@ namespace eShopOnContainers.Core.ViewModels
     {
         private ValidatableObject<string> _userName;
         private ValidatableObject<string> _password;
+        private bool _isMock;
         private bool _isValid;
+        private string _authUrl;
 
         private IOpenUrlService _openUrlService;
+        private IIdentityService _identityService;
 
-        public LoginViewModel(IOpenUrlService openUrlService)
+        public LoginViewModel(IOpenUrlService openUrlService,
+            IIdentityService identityService)
         {
             _openUrlService = openUrlService;
+            _identityService = identityService;
 
             _userName = new ValidatableObject<string>();
             _password = new ValidatableObject<string>();
 
+            IsMock = ViewModelLocator.Instance.UseMockService;
+
             AddValidations();
         }
 
@@ -53,6 +64,19 @@ namespace eShopOnContainers.Core.ViewModels
             }
         }
 
+        public bool IsMock
+        {
+            get
+            {
+                return _isMock;
+            }
+            set
+            {
+                _isMock = value;
+                RaisePropertyChanged(() => IsMock);
+            }
+        }
+
         public bool IsValid
         {
             get
@@ -66,11 +90,38 @@ namespace eShopOnContainers.Core.ViewModels
             }
         }
 
-        public ICommand SignInCommand => new Command(SignInAsync);
+        public string LoginUrl
+        {
+            get
+            {
+                return _authUrl;
+            }
+            set
+            {
+                _authUrl = value;
+                RaisePropertyChanged(() => LoginUrl);
+            }
+        }
+
+        public ICommand MockSignInCommand => new Command(MockSignInAsync);
+
+        public ICommand SignInCommand => new Command(async () => await SignInAsync());
 
         public ICommand RegisterCommand => new Command(Register);
 
-        private async void SignInAsync()
+        public ICommand NavigateCommand => new Command<string>(NavigateAsync);
+
+        public override Task InitializeAsync(object navigationData)
+        {
+            MessagingCenter.Subscribe<ProfileViewModel>(this, MessengerKeys.Logout, (sender) =>
+            {
+                Logout();
+            });
+
+            return base.InitializeAsync(navigationData);
+        }
+
+        private async void MockSignInAsync()
         {
             IsBusy = true;
             IsValid = true;
@@ -104,9 +155,57 @@ namespace eShopOnContainers.Core.ViewModels
             IsBusy = false;
         }
 
+        private async Task SignInAsync()
+        {
+            IsBusy = true;
+
+            await Task.Delay(500);
+
+            LoginUrl = _identityService.CreateAuthorizeRequest();
+
+            IsValid = true;
+
+            IsBusy = false;
+        }
+
         private void Register()
         {
-            _openUrlService.OpenUrl(GlobalSetting.RegisterWebsite);
+            _openUrlService.OpenUrl(GlobalSetting.Instance.RegisterWebsite);
+        }
+
+        private void Logout()
+        {
+            var token = Settings.AuthAccessToken;
+            var logoutRequest = _identityService.CreateLogoutRequest(token);
+
+            if(string.IsNullOrEmpty(logoutRequest))
+            {
+                IsValid = false;
+                LoginUrl = logoutRequest;
+                Settings.AuthAccessToken = string.Empty;
+            }
+        }
+
+        private async void NavigateAsync(string url)
+        {
+            if (url.Contains(GlobalSetting.Instance.IdentityCallback))
+            {
+                // Parse response
+                var authResponse = new AuthorizeResponse(url);
+
+                if (!string.IsNullOrWhiteSpace(authResponse.AccessToken))
+                {
+                    string decodedTokens = _identityService.DecodeToken(authResponse.AccessToken);
+                    
+                    if(decodedTokens != null)
+                    {
+                        Settings.AuthAccessToken = decodedTokens;
+
+                        await NavigationService.NavigateToAsync<MainViewModel>();
+                        await NavigationService.RemoveLastFromBackStackAsync();
+                    }
+                }
+            }
         }
 
         private bool Validate()
@@ -123,4 +222,4 @@ namespace eShopOnContainers.Core.ViewModels
             _password.Validations.Add(new IsNotNullOrEmptyRule<string> { ValidationMessage = "Password should not be empty" });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs
index fe69f36a4..43f4d29da 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs
@@ -1,6 +1,7 @@
 using eShopOnContainers.Core.Extensions;
 using eShopOnContainers.Core.Models.Orders;
-using eShopOnContainers.Core.Services.User;
+using eShopOnContainers.Core.Services.Order;
+using eShopOnContainers.Core.ViewModels.Base;
 using eShopOnContainers.ViewModels.Base;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
@@ -13,11 +14,11 @@ namespace eShopOnContainers.Core.ViewModels
     {
         private ObservableCollection<Order> _orders;
 
-        private IUserService _userService;
+        private IOrderService _orderService;
 
-        public ProfileViewModel(IUserService userService)
+        public ProfileViewModel(IOrderService orderService)
         {
-            _userService = userService;
+            _orderService = orderService;
         }
 
         public ObservableCollection<Order> Orders
@@ -38,7 +39,7 @@ namespace eShopOnContainers.Core.ViewModels
         {
             IsBusy = true;
 
-            var orders = await _userService.GetOrdersAsync();
+            var orders = await _orderService.GetOrdersAsync();
             Orders = orders.ToObservableCollection();
 
             IsBusy = false;
@@ -48,6 +49,7 @@ namespace eShopOnContainers.Core.ViewModels
         {
             IsBusy = true;
 
+            MessagingCenter.Send(this, MessengerKeys.Logout);
             await NavigationService.NavigateToAsync<LoginViewModel>();
             await NavigationService.RemoveBackStackAsync();
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
index 2cdacb480..77e0dbf9b 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
@@ -9,11 +9,12 @@ namespace eShopOnContainers.Core.ViewModels
     {
         private string _title;
         private string _description;
-        private bool _useMockServices;
+        private bool _useAzureServices;
+        private string _endpoint;
 
         public SettingsViewModel()
         {
-            UseMockServices = ViewModelLocator.Instance.UseMockService;
+            UseAzureServices = !ViewModelLocator.Instance.UseMockService;
         }
 
         public string Title
@@ -36,13 +37,29 @@ namespace eShopOnContainers.Core.ViewModels
             }
         }
 
-        public bool UseMockServices
+        public bool UseAzureServices
         {
-            get { return _useMockServices; }
+            get { return _useAzureServices; }
             set
             {
-                _useMockServices = value;
-                RaisePropertyChanged(() => UseMockServices);
+                _useAzureServices = value;
+                RaisePropertyChanged(() => UseAzureServices);
+            }
+        }
+
+        public string Endpoint
+        {
+            get { return _endpoint; }
+            set
+            {
+                _endpoint = value;
+
+                if(!string.IsNullOrEmpty(_endpoint))
+                {
+                    UpdateEndpoint(_endpoint);
+                }
+
+                RaisePropertyChanged(() => Endpoint);
             }
         }
 
@@ -50,7 +67,7 @@ namespace eShopOnContainers.Core.ViewModels
 
         private void MockServices()
         {
-            ViewModelLocator.Instance.UpdateServices(UseMockServices);
+            ViewModelLocator.Instance.UpdateDependencies(!UseAzureServices);
             UpdateInfo();
         }
 
@@ -58,12 +75,14 @@ namespace eShopOnContainers.Core.ViewModels
         {
             UpdateInfo();
 
+            Endpoint = GlobalSetting.Instance.BaseEndpoint;
+
             return base.InitializeAsync(navigationData);
         }
 
         private void UpdateInfo()
         {
-            if (!UseMockServices)
+            if (!UseAzureServices)
             {
                 Title = "Use Mock Services";
                 Description = "Mock Services are simulated objects that mimic the behavior of real services in controlled ways";
@@ -74,5 +93,10 @@ namespace eShopOnContainers.Core.ViewModels
                 Description = "Azure Services are real objects that required a valid internet connection";
             }
         }
+
+        private void UpdateEndpoint(string endpoint)
+        {
+            GlobalSetting.Instance.BaseEndpoint = endpoint;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml
index fd51414b6..870980ac2 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml
@@ -58,7 +58,8 @@
         </Grid.RowDefinitions>
         <!-- FILTERS -->
         <Grid
-            BackgroundColor="{StaticResource LightGreenColor}">
+            BackgroundColor="{StaticResource LightGreenColor}"                       
+            IsEnabled="{Binding Products.Count, Converter={StaticResource CountToBoolConverter}}">
             <Label 
                 Text="FILTER"
                 Style="{StaticResource FilterLabelStyle}"/>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml
index 2cc066c56..0fe1cd300 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml
@@ -176,7 +176,8 @@
                     </Grid.RowDefinitions>
                     <ListView 
                         Grid.Row="0"
-                        ItemsSource="{Binding Order.OrderItems}"       
+                        ItemsSource="{Binding Order.OrderItems}"   
+                        HeightRequest="{Binding Order.OrderItems.Count, Converter={StaticResource ItemsToHeightConverter}}"     
                         HasUnevenRows="True"
                         SeparatorVisibility="None"
                         VerticalOptions="FillAndExpand"
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationPage.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationPage.xaml
deleted file mode 100644
index 793425447..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationPage.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<NavigationPage xmlns="http://xamarin.com/schemas/2014/forms"
-                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                x:Class="eShopOnContainers.Core.Views.CustomNavigationPage"
-                BarBackgroundColor="{StaticResource GreenColor}"
-                BarTextColor="{StaticResource WhiteColor}"
-                BackgroundColor="Transparent">
-</NavigationPage>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationView.xaml
new file mode 100644
index 000000000..ec1d9ce83
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationView.xaml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<NavigationPage 
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="eShopOnContainers.Core.Views.CustomNavigationView"    
+    BarBackgroundColor="{StaticResource GreenColor}"
+    BarTextColor="{StaticResource WhiteColor}"
+    BackgroundColor="Transparent">
+</NavigationPage>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationPage.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationView.xaml.cs
similarity index 52%
rename from src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationPage.xaml.cs
rename to src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationView.xaml.cs
index a93f579ea..54fe9af54 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationPage.xaml.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CustomNavigationView.xaml.cs
@@ -2,14 +2,14 @@
 
 namespace eShopOnContainers.Core.Views
 {
-    public partial class CustomNavigationPage : NavigationPage
+    public partial class CustomNavigationView : NavigationPage
     {
-        public CustomNavigationPage() : base()
+        public CustomNavigationView() : base()
         {
             InitializeComponent();
         }
 
-        public CustomNavigationPage(Page root) : base(root)
+        public CustomNavigationView(Page root) : base(root)
         {
             InitializeComponent();
         }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml
index a078de3c6..968305356 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml
@@ -3,8 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="eShopOnContainers.Core.Views.LoginView"        
              xmlns:animations="clr-namespace:eShopOnContainers.Core.Animations;assembly=eShopOnContainers.Core"
-             xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
-             Title="eShop on Containers">
+             xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"   
+             xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core">
+    <ContentPage.Title>
+        <OnPlatform      
+            x:TypeArguments="x:String"
+            iOS="eShop on Containers"
+            WinPhone="eShop on Containers"/>
+    </ContentPage.Title>
     <ContentPage.Resources>
         <ResourceDictionary>
 
@@ -46,6 +52,25 @@
                         Value="Center" />
             </Style>
 
+            <Style x:Key="LoginPanelStyle" 
+               TargetType="{x:Type Grid}">
+                <Setter Property="HeightRequest"
+                        Value="60" />
+                <Setter Property="BackgroundColor"
+                        Value="{StaticResource LightGreenColor}" />
+                <Setter Property="HorizontalOptions"
+                        Value="FillAndExpand" />
+                <Setter Property="VerticalOptions"
+                        Value="FillAndExpand" />
+            </Style>
+
+            <Style x:Key="RegisterPanelStyle" 
+               TargetType="{x:Type Grid}"
+                   BasedOn="{StaticResource LoginPanelStyle}">
+                <Setter Property="BackgroundColor"
+                        Value="{StaticResource BlackColor}" />
+            </Style>
+
             <animations:StoryBoard 
                 x:Key="LoginAnimation"    
                 Target="{x:Reference LoginPanel}">
@@ -53,7 +78,7 @@
                     Direction="Up"
                     Duration="1500" />
             </animations:StoryBoard>
-            
+
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.Triggers>
@@ -65,8 +90,10 @@
     </ContentPage.Triggers>
     <Grid 
         BackgroundColor="{StaticResource BackgroundColor}">
+        <!-- MOCK AUTH -->
         <Grid   
-            x:Name="LoginPanel"
+            x:Name="LoginPanel"     
+            IsVisible="{Binding IsMock}"
             Padding="0"   
             ColumnSpacing="0"   
             RowSpacing="0">
@@ -154,6 +181,55 @@
                 Padding="0" 
                 ColumnSpacing="0" 
                 RowSpacing="0">
+                <Label       
+                    Text="[ LOGIN ]" 
+                    Style="{StaticResource LoginButtonStyle}"/>
+                <Grid.GestureRecognizers>
+                    <TapGestureRecognizer 
+                        Command="{Binding MockSignInCommand}"  
+                        NumberOfTapsRequired="1" />
+                </Grid.GestureRecognizers>
+            </Grid>
+        </Grid>
+        <!-- AUTH -->
+        <Grid
+            ColumnSpacing="0"
+            RowSpacing="0"
+            IsVisible="{Binding IsMock, Converter={StaticResource InverseBoolConverter}}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="60" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <!-- BANNER -->
+            <Image 
+                x:Name="Banner"
+                Grid.Row="0"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                Aspect="AspectFill">
+                <Image.Source>
+                    <OnPlatform 
+                        x:TypeArguments="ImageSource"
+                        Android="banner.png"
+                        iOS="banner.png"
+                        WinPhone="Assets\banner.png"/>
+                </Image.Source>
+            </Image>
+            <Grid      
+                Grid.Row="0"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                BackgroundColor="{StaticResource BlackColor}"
+                Opacity="0.5"/>
+            <!-- LOG IN BUTTON -->
+            <Grid 
+                Grid.Column="0"
+                Grid.Row="1"
+                Style="{StaticResource LoginPanelStyle}">
                 <Label       
                     Text="[ LOGIN ]" 
                     Style="{StaticResource LoginButtonStyle}"/>
@@ -163,6 +239,37 @@
                         NumberOfTapsRequired="1" />
                 </Grid.GestureRecognizers>
             </Grid>
+            <!-- REGISTER BUTTON -->
+            <Grid 
+                Grid.Column="1"
+                Grid.Row="1"
+                Style="{StaticResource RegisterPanelStyle}">
+                <Label       
+                    Text="[ REGISTER ]" 
+                    Style="{StaticResource LoginButtonStyle}"/>
+                <Grid.GestureRecognizers>
+                    <TapGestureRecognizer 
+                        Command="{Binding RegisterCommand}"  
+                        NumberOfTapsRequired="1" />
+                </Grid.GestureRecognizers>
+            </Grid>
+            <!-- WEBVIEW -->
+            <AbsoluteLayout
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                IsVisible="{Binding IsValid}">
+                <WebView 
+                    Source="{Binding LoginUrl}"
+			        AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
+			        AbsoluteLayout.LayoutFlags="All">
+                    <WebView.Behaviors>
+                        <behaviors:WebViewNavigationBehavior 
+                            NavigateCommand="{Binding NavigateCommand}"/>
+                    </WebView.Behaviors>
+                </WebView>
+            </AbsoluteLayout>
         </Grid>
         <!-- INDICATOR -->
         <ActivityIndicator 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
index 7932b3c2e..4d3a5762e 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs
@@ -1,12 +1,64 @@
-using Xamarin.Forms;
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace eShopOnContainers.Core.Views
 {
     public partial class LoginView : ContentPage
     {
+        private bool _animate;
+
         public LoginView()
         {
             InitializeComponent();
         }
+
+        protected override async void OnAppearing()
+        {
+            var content = this.Content;
+            this.Content = null;
+            this.Content = content;
+
+            _animate = true;
+            await AnimateIn();
+        }
+
+        protected override void OnDisappearing()
+        {
+            _animate = false;
+        }
+
+        public async Task AnimateIn()
+        {
+            if (Device.OS == TargetPlatform.Windows)
+            {
+                return;
+            }
+
+            await AnimateItem(Banner, 10500);
+        }
+
+        private async Task AnimateItem(View uiElement, uint duration)
+        {
+            try
+            {
+                while (_animate)
+                {
+                    await uiElement.ScaleTo(1.05, duration, Easing.SinInOut);
+
+                    await Task.WhenAll(
+                        uiElement.FadeTo(1, duration, Easing.SinInOut),
+                        uiElement.LayoutTo(new Rectangle(new Point(0, 0), new Size(uiElement.Width, uiElement.Height))),
+                        uiElement.FadeTo(.9, duration, Easing.SinInOut),
+                        uiElement.ScaleTo(1.15, duration, Easing.SinInOut)
+                    );
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex.Message);
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml
index 3d8286840..2bf39db64 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml
@@ -6,8 +6,13 @@
             xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
             BarBackgroundColor="{StaticResource DarkGreenColor}"
             BackgroundColor="{StaticResource BackgroundColor}"
-            BarTextColor="{StaticResource WhiteColor}"
-            Title="eShop on Containers">
+            BarTextColor="{StaticResource WhiteColor}">
+    <TabbedPage.Title>
+        <OnPlatform      
+            x:TypeArguments="x:String"
+            iOS="eShop on Containers"
+            WinPhone="eShop on Containers"/>
+    </TabbedPage.Title>
     <ContentPage.ToolbarItems>
         <ToolbarItem 
             Command="{Binding SettingsCommand}"
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/ProfileView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/ProfileView.xaml
index 07952c220..979e24169 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/ProfileView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/ProfileView.xaml
@@ -78,26 +78,36 @@
                 Grid.Row="0"
                 Text="MY ORDERS"
                 Style="{StaticResource MyOrdersLabelStyle}"/>
-            <ListView 
-                Grid.Row="1" 
-                ItemsSource="{Binding Orders}"
-                HasUnevenRows="True"
-                SeparatorVisibility="None"
-                CachingStrategy="RecycleElement">
-                <ListView.Behaviors>
-                    <behaviors:EventToCommandBehavior
-                        EventName="ItemTapped"
-                        Command="{Binding OrderDetailCommand}"
-                        EventArgsConverter="{StaticResource ItemTappedEventArgsConverter}" />
-                </ListView.Behaviors>
-                <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <ViewCell>
-                            <templates:OrderTemplate />
-                        </ViewCell>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
+            <Grid 
+                Grid.Row="1">
+                <Grid 
+                    IsVisible="{Binding IsBusy, Converter={StaticResource InverseBoolConverter}}">
+                    <Label 
+                        Text="NO ORDERS"      
+                        IsVisible="{Binding Orders.Count, Converter={StaticResource InverseCountToBoolConverter}}"
+                        HorizontalOptions="Center"
+                        VerticalOptions="Center"/>
+                </Grid>
+                <ListView 
+                    ItemsSource="{Binding Orders}"
+                    HasUnevenRows="True"
+                    SeparatorVisibility="None"
+                    CachingStrategy="RecycleElement">
+                    <ListView.Behaviors>
+                        <behaviors:EventToCommandBehavior           
+                            EventName="ItemTapped"
+                            Command="{Binding OrderDetailCommand}"
+                            EventArgsConverter="{StaticResource ItemTappedEventArgsConverter}" />
+                    </ListView.Behaviors>
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <ViewCell>
+                                <templates:OrderTemplate />
+                            </ViewCell>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+            </Grid>
         </Grid>
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
index f28f121c1..b13a4855d 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
@@ -43,6 +43,18 @@
                         Value="12, 12, 12, 0" />
             </Style>
 
+            <Style x:Key="HeaderLabelStyle" 
+               TargetType="{x:Type Label}">
+                <Setter Property="FontFamily"
+                        Value="{StaticResource MontserratRegular}" />
+                <Setter Property="FontSize"
+                        Value="{StaticResource LittleSize}" />
+                <Setter Property="TextColor"
+                        Value="{StaticResource GreenColor}" />
+                <Setter Property="HorizontalOptions"
+                        Value="Start" />
+            </Style>
+            
             <animations:StoryBoard 
                 x:Key="MockServicesAnimation"    
                 Target="{x:Reference MockServices}">
@@ -82,6 +94,7 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="1" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                         <RowDefinition Height="1" />
                     </Grid.RowDefinitions>
                     <Grid 
@@ -105,7 +118,7 @@
                         Grid.Column="1" 
                         Grid.Row="1" 
                         Animate="True"     
-                        Checked="{Binding UseMockServices, Mode=TwoWay}"
+                        Checked="{Binding UseAzureServices, Mode=TwoWay}"
                         Command="{Binding MockServicesCommand}"
                         Style="{StaticResource SettingsToggleButtonStyle}">
                         <controls:ToggleButton.CheckedImage>
@@ -121,10 +134,31 @@
                               WinPhone="Assets/switchOff.png"/>
                         </controls:ToggleButton.UnCheckedImage>
                     </controls:ToggleButton>
-                    <Grid 
+                    <!-- ENDPOINT -->
+                    <StackLayout
                         Grid.Row="2"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
+                        Margin="12, 0, 12, 12"
+                        IsVisible="{Binding UseAzureServices}">
+                        <Label
+                            Text="Endpoint"
+                            Style="{StaticResource HeaderLabelStyle}"/>
+                        <Entry
+                            Text="{Binding Endpoint, Mode=TwoWay}">
+                            <Entry.Style>
+                                <OnPlatform 
+                                    x:TypeArguments="Style"
+                                    iOS="{StaticResource EntryStyle}"
+                                    Android="{StaticResource EntryStyle}"
+                                    WinPhone="{StaticResource UwpEntryStyle}"/>
+                            </Entry.Style>
+                        </Entry>
+                    </StackLayout>
+                    <Grid 
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
                         BackgroundColor="Gray"/>
                 </Grid>
             </StackLayout>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml.cs
index f7ad31a47..e57c8fd32 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
+using Xamarin.Forms;
 
 namespace eShopOnContainers.Core.Views
 {
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml
index 48ec265a9..76c37db3c 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml
@@ -56,6 +56,8 @@
 
             <Style x:Key="QuantityPickerStyle"  
              TargetType="{x:Type controls:BindablePicker}">
+                <Setter Property="TextColor"
+                        Value="{StaticResource BlackColor}" />
                 <Setter Property="BackgroundColor"
                         Value="Transparent" />
                 <Setter Property="HorizontalOptions"
@@ -139,7 +141,7 @@
                     <controls:BindablePicker 
                         Grid.Column="1"
                         ItemsSource="{Binding Numbers}"
-                        SelectedItem="{Binding Quantity, Mode=TwoWay}"
+                        SelectedItem="{Binding Quantity, Mode=TwoWay}" 
                         Style="{StaticResource QuantityPickerStyle}">
                         <controls:BindablePicker.WidthRequest>
                             <OnPlatform         
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/OrderItemTemplate.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/OrderItemTemplate.xaml
index 0fe18371c..366adfde3 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/OrderItemTemplate.xaml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/OrderItemTemplate.xaml
@@ -15,6 +15,8 @@
                         Value="{StaticResource MediumSize}" />
                 <Setter Property="TextColor" 
                         Value="{StaticResource BlackColor}" />
+                <Setter Property="LineBreakMode" 
+                        Value="HeadTruncation" />
             </Style>
 
             <Style x:Key="OrderItemUnitPriceStyle" 
@@ -107,7 +109,8 @@
                 <!-- NAME -->
                 <Label
                     Grid.Row="0"
-                    Text="{Binding ProductName, Converter={StaticResource ToUpperConverter}}"/>
+                    Text="{Binding ProductName, Converter={StaticResource ToUpperConverter}}"
+                    Style="{StaticResource OrderItemTitleStyle}"/>
                 <Grid
                     Grid.Row="1">
                     <Grid.ColumnDefinitions>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
index 6f8f0986c..a1e3552ce 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
@@ -44,6 +44,7 @@
     </Compile>
     <Compile Include="Behaviors\Base\BindableBehavior.cs" />
     <Compile Include="Behaviors\EventToCommandBehavior.cs" />
+    <Compile Include="Behaviors\WebViewNavigationBehavior.cs" />
     <Compile Include="Controls\BindablePicker.cs" />
     <Compile Include="Controls\AddBasketButton.xaml.cs">
       <DependentUpon>AddBasketButton.xaml</DependentUpon>
@@ -65,12 +66,14 @@
     <Compile Include="GlobalSettings.cs" />
     <Compile Include="Helpers\EasingHelper.cs" />
     <Compile Include="Helpers\NumericHelper.cs" />
+    <Compile Include="Helpers\Settings.cs" />
     <Compile Include="Models\Basket\BasketItem.cs" />
     <Compile Include="Models\Catalog\CatalogBrand.cs" />
     <Compile Include="Models\Catalog\CatalogRoot.cs" />
     <Compile Include="Models\Catalog\CatalogType.cs" />
     <Compile Include="Models\Navigation\TabParameter.cs" />
     <Compile Include="Models\Basket\CustomerBasket.cs" />
+    <Compile Include="Models\Orders\CardType.cs" />
     <Compile Include="Models\Orders\Order.cs" />
     <Compile Include="Models\Orders\OrderItem.cs" />
     <Compile Include="Models\Orders\OrderStatus.cs" />
@@ -80,6 +83,8 @@
     <Compile Include="Services\Catalog\CatalogService.cs" />
     <Compile Include="Services\Dialog\DialogService.cs" />
     <Compile Include="Services\Dialog\IDialogService.cs" />
+    <Compile Include="Services\Identity\IdentityService.cs" />
+    <Compile Include="Services\Identity\IIdentityService.cs" />
     <Compile Include="Services\Navigation\INavigationService.cs" />
     <Compile Include="Services\Navigation\NavigationService.cs" />
     <Compile Include="Services\OpenUrl\IOpenUrlService.cs" />
@@ -89,6 +94,9 @@
     <Compile Include="Services\Catalog\CatalogMockService.cs" />
     <Compile Include="Services\Catalog\ICatalogService.cs" />
     <Compile Include="Services\Basket\BasketService.cs" />
+    <Compile Include="Services\Order\IOrderService.cs" />
+    <Compile Include="Services\Order\OrderMockService.cs" />
+    <Compile Include="Services\Order\OrderService.cs" />
     <Compile Include="Services\RequestProvider\IRequestProvider.cs" />
     <Compile Include="Services\RequestProvider\RequestProvider.cs" />
     <Compile Include="Services\User\IUserService.cs" />
@@ -116,8 +124,8 @@
     <Compile Include="Views\CheckoutView.xaml.cs">
       <DependentUpon>CheckoutView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\CustomNavigationPage.xaml.cs">
-      <DependentUpon>CustomNavigationPage.xaml</DependentUpon>
+    <Compile Include="Views\CustomNavigationView.xaml.cs">
+      <DependentUpon>CustomNavigationView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\FiltersView.xaml.cs">
       <DependentUpon>FiltersView.xaml</DependentUpon>
@@ -186,6 +194,10 @@
       <HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="IdentityModel, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\IdentityModel.1.13.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
@@ -202,6 +214,14 @@
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Settings.Abstractions, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SlideOverKit.2.1.4\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SlideOverKit.dll</HintPath>
       <Private>True</Private>
@@ -282,7 +302,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\CustomNavigationPage.xaml">
+    <EmbeddedResource Include="Views\CustomNavigationView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/packages.config
index b7e19570b..673a5fcb8 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/packages.config
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="Acr.UserDialogs" version="6.3.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="IdentityModel" version="1.13.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" />
@@ -10,6 +11,7 @@
   <package id="SlideOverKit" version="2.1.4" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Splat" version="1.6.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Unity" version="4.0.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Xamarin.FFImageLoading" version="2.2.6-pre-232" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.6-pre-232" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wp8+wpa81" />
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Helpers/Settings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Helpers/Settings.cs
new file mode 100644
index 000000000..26dd9496b
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Helpers/Settings.cs
@@ -0,0 +1,44 @@
+/*
+// Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it.
+using Plugin.Settings;
+using Plugin.Settings.Abstractions;
+
+namespace eShopOnContainers.Droid.Helpers
+{
+  /// <summary>
+  /// This is the Settings static class that can be used in your Core solution or in any
+  /// of your client applications. All settings are laid out the same exact way with getters
+  /// and setters. 
+  /// </summary>
+  public static class Settings
+  {
+    private static ISettings AppSettings
+    {
+      get
+      {
+        return CrossSettings.Current;
+      }
+    }
+
+    #region Setting Constants
+
+    private const string SettingsKey = "settings_key";
+    private static readonly string SettingsDefault = string.Empty;
+
+    #endregion
+
+
+    public static string GeneralSettings
+    {
+      get
+      {
+        return AppSettings.GetValueOrDefault<string>(SettingsKey, SettingsDefault);
+      }
+      set
+      {
+        AppSettings.AddOrUpdateValue<string>(SettingsKey, value);
+      }
+    }
+
+  }
+}*/
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomNavigationPageRenderer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomNavigationPageRenderer.cs
new file mode 100644
index 000000000..5a58cfed7
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomNavigationPageRenderer.cs
@@ -0,0 +1,33 @@
+using Android.Widget;
+using eShopOnContainers.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android.AppCompat;
+
+[assembly: ExportRenderer(typeof(NavigationPage), typeof(CustomNavigationPageRenderer))]
+namespace eShopOnContainers.Droid.Renderers
+{
+    public class CustomNavigationPageRenderer : NavigationPageRenderer
+    {
+        protected override void OnLayout(bool changed, int l, int t, int r, int b)
+        {
+            base.OnLayout(changed, l, t, r, b);
+
+            var toolbar = FindViewById<Android.Support.V7.Widget.Toolbar>(Resource.Id.toolbar);
+
+            if (toolbar != null)
+            {
+                var image = toolbar.FindViewById<ImageView>(Resource.Id.toolbar_image);
+
+                if (Element.CurrentPage == null)
+                {
+                    return;
+                }
+
+                if (!string.IsNullOrEmpty(Element.CurrentPage.Title))
+                    image.Visibility = Android.Views.ViewStates.Invisible;
+                else
+                    image.Visibility = Android.Views.ViewStates.Visible;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs
index 689ed0316..ecce1f7e5 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs
@@ -12,7 +12,6 @@ using eShopOnContainers.Core.Controls;
 using eShopOnContainers.Droid.Renderers;
 using Android.Support.V4.View;
 using Android.Graphics;
-using static Android.Widget.ImageView;
 
 [assembly: ExportRenderer(typeof(TabbedPage), typeof(CustomTabbedPageRenderer))]
 namespace eShopOnContainers.Droid.Renderers
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
index 7895eb14a..f8a062fca 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
@@ -2027,319 +2027,325 @@ namespace eShopOnContainers.Droid
 			public const int background = 2130837580;
 			
 			// aapt resource value: 0x7f02004d
-			public const int default_product = 2130837581;
+			public const int banner = 2130837581;
 			
 			// aapt resource value: 0x7f02004e
-			public const int design_fab_background = 2130837582;
+			public const int default_product = 2130837582;
 			
 			// aapt resource value: 0x7f02004f
-			public const int design_snackbar_background = 2130837583;
+			public const int design_fab_background = 2130837583;
 			
 			// aapt resource value: 0x7f020050
-			public const int fake_product_01 = 2130837584;
+			public const int design_snackbar_background = 2130837584;
 			
 			// aapt resource value: 0x7f020051
-			public const int fake_product_02 = 2130837585;
+			public const int fake_product_01 = 2130837585;
 			
 			// aapt resource value: 0x7f020052
-			public const int fake_product_03 = 2130837586;
+			public const int fake_product_02 = 2130837586;
 			
 			// aapt resource value: 0x7f020053
-			public const int fake_product_04 = 2130837587;
+			public const int fake_product_03 = 2130837587;
 			
 			// aapt resource value: 0x7f020054
-			public const int fake_product_05 = 2130837588;
+			public const int fake_product_04 = 2130837588;
 			
 			// aapt resource value: 0x7f020055
-			public const int ic_audiotrack = 2130837589;
+			public const int fake_product_05 = 2130837589;
 			
 			// aapt resource value: 0x7f020056
-			public const int ic_audiotrack_light = 2130837590;
+			public const int header_logo = 2130837590;
 			
 			// aapt resource value: 0x7f020057
-			public const int ic_bluetooth_grey = 2130837591;
+			public const int ic_audiotrack = 2130837591;
 			
 			// aapt resource value: 0x7f020058
-			public const int ic_bluetooth_white = 2130837592;
+			public const int ic_audiotrack_light = 2130837592;
 			
 			// aapt resource value: 0x7f020059
-			public const int ic_cast_dark = 2130837593;
+			public const int ic_bluetooth_grey = 2130837593;
 			
 			// aapt resource value: 0x7f02005a
-			public const int ic_cast_disabled_light = 2130837594;
+			public const int ic_bluetooth_white = 2130837594;
 			
 			// aapt resource value: 0x7f02005b
-			public const int ic_cast_grey = 2130837595;
+			public const int ic_cast_dark = 2130837595;
 			
 			// aapt resource value: 0x7f02005c
-			public const int ic_cast_light = 2130837596;
+			public const int ic_cast_disabled_light = 2130837596;
 			
 			// aapt resource value: 0x7f02005d
-			public const int ic_cast_off_light = 2130837597;
+			public const int ic_cast_grey = 2130837597;
 			
 			// aapt resource value: 0x7f02005e
-			public const int ic_cast_on_0_light = 2130837598;
+			public const int ic_cast_light = 2130837598;
 			
 			// aapt resource value: 0x7f02005f
-			public const int ic_cast_on_1_light = 2130837599;
+			public const int ic_cast_off_light = 2130837599;
 			
 			// aapt resource value: 0x7f020060
-			public const int ic_cast_on_2_light = 2130837600;
+			public const int ic_cast_on_0_light = 2130837600;
 			
 			// aapt resource value: 0x7f020061
-			public const int ic_cast_on_light = 2130837601;
+			public const int ic_cast_on_1_light = 2130837601;
 			
 			// aapt resource value: 0x7f020062
-			public const int ic_cast_white = 2130837602;
+			public const int ic_cast_on_2_light = 2130837602;
 			
 			// aapt resource value: 0x7f020063
-			public const int ic_close_dark = 2130837603;
+			public const int ic_cast_on_light = 2130837603;
 			
 			// aapt resource value: 0x7f020064
-			public const int ic_close_light = 2130837604;
+			public const int ic_cast_white = 2130837604;
 			
 			// aapt resource value: 0x7f020065
-			public const int ic_collapse = 2130837605;
+			public const int ic_close_dark = 2130837605;
 			
 			// aapt resource value: 0x7f020066
-			public const int ic_collapse_00000 = 2130837606;
+			public const int ic_close_light = 2130837606;
 			
 			// aapt resource value: 0x7f020067
-			public const int ic_collapse_00001 = 2130837607;
+			public const int ic_collapse = 2130837607;
 			
 			// aapt resource value: 0x7f020068
-			public const int ic_collapse_00002 = 2130837608;
+			public const int ic_collapse_00000 = 2130837608;
 			
 			// aapt resource value: 0x7f020069
-			public const int ic_collapse_00003 = 2130837609;
+			public const int ic_collapse_00001 = 2130837609;
 			
 			// aapt resource value: 0x7f02006a
-			public const int ic_collapse_00004 = 2130837610;
+			public const int ic_collapse_00002 = 2130837610;
 			
 			// aapt resource value: 0x7f02006b
-			public const int ic_collapse_00005 = 2130837611;
+			public const int ic_collapse_00003 = 2130837611;
 			
 			// aapt resource value: 0x7f02006c
-			public const int ic_collapse_00006 = 2130837612;
+			public const int ic_collapse_00004 = 2130837612;
 			
 			// aapt resource value: 0x7f02006d
-			public const int ic_collapse_00007 = 2130837613;
+			public const int ic_collapse_00005 = 2130837613;
 			
 			// aapt resource value: 0x7f02006e
-			public const int ic_collapse_00008 = 2130837614;
+			public const int ic_collapse_00006 = 2130837614;
 			
 			// aapt resource value: 0x7f02006f
-			public const int ic_collapse_00009 = 2130837615;
+			public const int ic_collapse_00007 = 2130837615;
 			
 			// aapt resource value: 0x7f020070
-			public const int ic_collapse_00010 = 2130837616;
+			public const int ic_collapse_00008 = 2130837616;
 			
 			// aapt resource value: 0x7f020071
-			public const int ic_collapse_00011 = 2130837617;
+			public const int ic_collapse_00009 = 2130837617;
 			
 			// aapt resource value: 0x7f020072
-			public const int ic_collapse_00012 = 2130837618;
+			public const int ic_collapse_00010 = 2130837618;
 			
 			// aapt resource value: 0x7f020073
-			public const int ic_collapse_00013 = 2130837619;
+			public const int ic_collapse_00011 = 2130837619;
 			
 			// aapt resource value: 0x7f020074
-			public const int ic_collapse_00014 = 2130837620;
+			public const int ic_collapse_00012 = 2130837620;
 			
 			// aapt resource value: 0x7f020075
-			public const int ic_collapse_00015 = 2130837621;
+			public const int ic_collapse_00013 = 2130837621;
 			
 			// aapt resource value: 0x7f020076
-			public const int ic_errorstatus = 2130837622;
+			public const int ic_collapse_00014 = 2130837622;
 			
 			// aapt resource value: 0x7f020077
-			public const int ic_expand = 2130837623;
+			public const int ic_collapse_00015 = 2130837623;
 			
 			// aapt resource value: 0x7f020078
-			public const int ic_expand_00000 = 2130837624;
+			public const int ic_errorstatus = 2130837624;
 			
 			// aapt resource value: 0x7f020079
-			public const int ic_expand_00001 = 2130837625;
+			public const int ic_expand = 2130837625;
 			
 			// aapt resource value: 0x7f02007a
-			public const int ic_expand_00002 = 2130837626;
+			public const int ic_expand_00000 = 2130837626;
 			
 			// aapt resource value: 0x7f02007b
-			public const int ic_expand_00003 = 2130837627;
+			public const int ic_expand_00001 = 2130837627;
 			
 			// aapt resource value: 0x7f02007c
-			public const int ic_expand_00004 = 2130837628;
+			public const int ic_expand_00002 = 2130837628;
 			
 			// aapt resource value: 0x7f02007d
-			public const int ic_expand_00005 = 2130837629;
+			public const int ic_expand_00003 = 2130837629;
 			
 			// aapt resource value: 0x7f02007e
-			public const int ic_expand_00006 = 2130837630;
+			public const int ic_expand_00004 = 2130837630;
 			
 			// aapt resource value: 0x7f02007f
-			public const int ic_expand_00007 = 2130837631;
+			public const int ic_expand_00005 = 2130837631;
 			
 			// aapt resource value: 0x7f020080
-			public const int ic_expand_00008 = 2130837632;
+			public const int ic_expand_00006 = 2130837632;
 			
 			// aapt resource value: 0x7f020081
-			public const int ic_expand_00009 = 2130837633;
+			public const int ic_expand_00007 = 2130837633;
 			
 			// aapt resource value: 0x7f020082
-			public const int ic_expand_00010 = 2130837634;
+			public const int ic_expand_00008 = 2130837634;
 			
 			// aapt resource value: 0x7f020083
-			public const int ic_expand_00011 = 2130837635;
+			public const int ic_expand_00009 = 2130837635;
 			
 			// aapt resource value: 0x7f020084
-			public const int ic_expand_00012 = 2130837636;
+			public const int ic_expand_00010 = 2130837636;
 			
 			// aapt resource value: 0x7f020085
-			public const int ic_expand_00013 = 2130837637;
+			public const int ic_expand_00011 = 2130837637;
 			
 			// aapt resource value: 0x7f020086
-			public const int ic_expand_00014 = 2130837638;
+			public const int ic_expand_00012 = 2130837638;
 			
 			// aapt resource value: 0x7f020087
-			public const int ic_expand_00015 = 2130837639;
+			public const int ic_expand_00013 = 2130837639;
 			
 			// aapt resource value: 0x7f020088
-			public const int ic_media_pause = 2130837640;
+			public const int ic_expand_00014 = 2130837640;
 			
 			// aapt resource value: 0x7f020089
-			public const int ic_media_play = 2130837641;
+			public const int ic_expand_00015 = 2130837641;
 			
 			// aapt resource value: 0x7f02008a
-			public const int ic_media_route_disabled_mono_dark = 2130837642;
+			public const int ic_media_pause = 2130837642;
 			
 			// aapt resource value: 0x7f02008b
-			public const int ic_media_route_off_mono_dark = 2130837643;
+			public const int ic_media_play = 2130837643;
 			
 			// aapt resource value: 0x7f02008c
-			public const int ic_media_route_on_0_mono_dark = 2130837644;
+			public const int ic_media_route_disabled_mono_dark = 2130837644;
 			
 			// aapt resource value: 0x7f02008d
-			public const int ic_media_route_on_1_mono_dark = 2130837645;
+			public const int ic_media_route_off_mono_dark = 2130837645;
 			
 			// aapt resource value: 0x7f02008e
-			public const int ic_media_route_on_2_mono_dark = 2130837646;
+			public const int ic_media_route_on_0_mono_dark = 2130837646;
 			
 			// aapt resource value: 0x7f02008f
-			public const int ic_media_route_on_mono_dark = 2130837647;
+			public const int ic_media_route_on_1_mono_dark = 2130837647;
 			
 			// aapt resource value: 0x7f020090
-			public const int ic_pause_dark = 2130837648;
+			public const int ic_media_route_on_2_mono_dark = 2130837648;
 			
 			// aapt resource value: 0x7f020091
-			public const int ic_pause_light = 2130837649;
+			public const int ic_media_route_on_mono_dark = 2130837649;
 			
 			// aapt resource value: 0x7f020092
-			public const int ic_play_dark = 2130837650;
+			public const int ic_pause_dark = 2130837650;
 			
 			// aapt resource value: 0x7f020093
-			public const int ic_play_light = 2130837651;
+			public const int ic_pause_light = 2130837651;
 			
 			// aapt resource value: 0x7f020094
-			public const int ic_speaker_dark = 2130837652;
+			public const int ic_play_dark = 2130837652;
 			
 			// aapt resource value: 0x7f020095
-			public const int ic_speaker_group_dark = 2130837653;
+			public const int ic_play_light = 2130837653;
 			
 			// aapt resource value: 0x7f020096
-			public const int ic_speaker_group_light = 2130837654;
+			public const int ic_speaker_dark = 2130837654;
 			
 			// aapt resource value: 0x7f020097
-			public const int ic_speaker_light = 2130837655;
+			public const int ic_speaker_group_dark = 2130837655;
 			
 			// aapt resource value: 0x7f020098
-			public const int ic_successstatus = 2130837656;
+			public const int ic_speaker_group_light = 2130837656;
 			
 			// aapt resource value: 0x7f020099
-			public const int ic_tv_dark = 2130837657;
+			public const int ic_speaker_light = 2130837657;
 			
 			// aapt resource value: 0x7f02009a
-			public const int ic_tv_light = 2130837658;
+			public const int ic_successstatus = 2130837658;
 			
 			// aapt resource value: 0x7f02009b
-			public const int icon = 2130837659;
+			public const int ic_tv_dark = 2130837659;
 			
 			// aapt resource value: 0x7f02009c
-			public const int menu_cart = 2130837660;
+			public const int ic_tv_light = 2130837660;
 			
 			// aapt resource value: 0x7f02009d
-			public const int menu_filter = 2130837661;
+			public const int icon = 2130837661;
 			
 			// aapt resource value: 0x7f02009e
-			public const int menu_profile = 2130837662;
+			public const int menu_cart = 2130837662;
 			
 			// aapt resource value: 0x7f02009f
-			public const int mr_dialog_material_background_dark = 2130837663;
+			public const int menu_filter = 2130837663;
 			
 			// aapt resource value: 0x7f0200a0
-			public const int mr_dialog_material_background_light = 2130837664;
+			public const int menu_profile = 2130837664;
 			
 			// aapt resource value: 0x7f0200a1
-			public const int mr_ic_audiotrack_light = 2130837665;
+			public const int mr_dialog_material_background_dark = 2130837665;
 			
 			// aapt resource value: 0x7f0200a2
-			public const int mr_ic_cast_dark = 2130837666;
+			public const int mr_dialog_material_background_light = 2130837666;
 			
 			// aapt resource value: 0x7f0200a3
-			public const int mr_ic_cast_light = 2130837667;
+			public const int mr_ic_audiotrack_light = 2130837667;
 			
 			// aapt resource value: 0x7f0200a4
-			public const int mr_ic_close_dark = 2130837668;
+			public const int mr_ic_cast_dark = 2130837668;
 			
 			// aapt resource value: 0x7f0200a5
-			public const int mr_ic_close_light = 2130837669;
+			public const int mr_ic_cast_light = 2130837669;
 			
 			// aapt resource value: 0x7f0200a6
-			public const int mr_ic_media_route_connecting_mono_dark = 2130837670;
+			public const int mr_ic_close_dark = 2130837670;
 			
 			// aapt resource value: 0x7f0200a7
-			public const int mr_ic_media_route_connecting_mono_light = 2130837671;
+			public const int mr_ic_close_light = 2130837671;
 			
 			// aapt resource value: 0x7f0200a8
-			public const int mr_ic_media_route_mono_dark = 2130837672;
+			public const int mr_ic_media_route_connecting_mono_dark = 2130837672;
 			
 			// aapt resource value: 0x7f0200a9
-			public const int mr_ic_media_route_mono_light = 2130837673;
+			public const int mr_ic_media_route_connecting_mono_light = 2130837673;
 			
 			// aapt resource value: 0x7f0200aa
-			public const int mr_ic_pause_dark = 2130837674;
+			public const int mr_ic_media_route_mono_dark = 2130837674;
 			
 			// aapt resource value: 0x7f0200ab
-			public const int mr_ic_pause_light = 2130837675;
+			public const int mr_ic_media_route_mono_light = 2130837675;
 			
 			// aapt resource value: 0x7f0200ac
-			public const int mr_ic_play_dark = 2130837676;
+			public const int mr_ic_pause_dark = 2130837676;
 			
 			// aapt resource value: 0x7f0200ad
-			public const int mr_ic_play_light = 2130837677;
+			public const int mr_ic_pause_light = 2130837677;
 			
 			// aapt resource value: 0x7f0200ae
-			public const int noimage = 2130837678;
-			
-			// aapt resource value: 0x7f0200b5
-			public const int notification_template_icon_bg = 2130837685;
+			public const int mr_ic_play_dark = 2130837678;
 			
 			// aapt resource value: 0x7f0200af
-			public const int product_add = 2130837679;
+			public const int mr_ic_play_light = 2130837679;
 			
 			// aapt resource value: 0x7f0200b0
-			public const int roundedbg = 2130837680;
+			public const int noimage = 2130837680;
+			
+			// aapt resource value: 0x7f0200b7
+			public const int notification_template_icon_bg = 2130837687;
 			
 			// aapt resource value: 0x7f0200b1
-			public const int roundedbgdark = 2130837681;
+			public const int product_add = 2130837681;
 			
 			// aapt resource value: 0x7f0200b2
-			public const int splash_drawable = 2130837682;
+			public const int roundedbg = 2130837682;
 			
 			// aapt resource value: 0x7f0200b3
-			public const int switch_off = 2130837683;
+			public const int roundedbgdark = 2130837683;
 			
 			// aapt resource value: 0x7f0200b4
-			public const int switch_on = 2130837684;
+			public const int splash_drawable = 2130837684;
+			
+			// aapt resource value: 0x7f0200b5
+			public const int switch_off = 2130837685;
+			
+			// aapt resource value: 0x7f0200b6
+			public const int switch_on = 2130837686;
 			
 			static Drawable()
 			{
@@ -2810,6 +2816,9 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 0x7f0700a0
 			public const int toolbar = 2131165344;
 			
+			// aapt resource value: 0x7f0700a1
+			public const int toolbar_image = 2131165345;
+			
 			// aapt resource value: 0x7f070032
 			public const int top = 2131165234;
 			
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/header_logo.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/header_logo.png
new file mode 100644
index 000000000..38ad4f480
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-hdpi/header_logo.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/header_logo.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/header_logo.png
new file mode 100644
index 000000000..47e8cadee
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xhdpi/header_logo.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/header_logo.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/header_logo.png
new file mode 100644
index 000000000..f9a0a4754
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable-xxhdpi/header_logo.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/banner.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/banner.png
new file mode 100644
index 000000000..315517826
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/drawable/banner.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/layout/Toolbar.axml b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/layout/Toolbar.axml
index fb51f3f27..593c21397 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/layout/Toolbar.axml
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/layout/Toolbar.axml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar 
+<android.support.v7.widget.Toolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/toolbar"
@@ -9,4 +9,12 @@
   android:background="?attr/colorPrimary"
   android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
   app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-  app:layout_scrollFlags="scroll|enterAlways" />
\ No newline at end of file
+  app:layout_scrollFlags="scroll|enterAlways">
+  <ImageView  
+    android:id="@+id/toolbar_image"
+    android:src="@drawable/header_logo"  
+    android:scaleType="fitCenter"
+    android:layout_width="124dp" 
+    android:layout_height="48dp"
+    android:layout_gravity="center" />
+</android.support.v7.widget.Toolbar>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
index 003a04a26..bff3a3eb4 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
@@ -16,7 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
     <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
     <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
@@ -116,6 +116,14 @@
       <HintPath>..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Settings.Abstractions, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll</HintPath>
       <Private>True</Private>
@@ -203,7 +211,9 @@
     <Compile Include="Activities\SplashActivity.cs" />
     <Compile Include="Effects\EntryLineColorEffect.cs" />
     <Compile Include="Extensions\ViewExtensions.cs" />
+    <Compile Include="Helpers\Settings.cs" />
     <Compile Include="Renderers\BadgeView.cs" />
+    <Compile Include="Renderers\CustomNavigationPageRenderer.cs" />
     <Compile Include="Renderers\CustomTabbedPageRenderer.cs" />
     <Compile Include="Renderers\SlideDownMenuPageRenderer.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
@@ -346,6 +356,18 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\default_product.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\banner.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\header_logo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\header_logo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\header_logo.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak
index dcd1de431..6ed77d519 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak
@@ -116,6 +116,14 @@
       <HintPath>..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Settings.Abstractions, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll</HintPath>
       <Private>True</Private>
@@ -203,7 +211,9 @@
     <Compile Include="Activities\SplashActivity.cs" />
     <Compile Include="Effects\EntryLineColorEffect.cs" />
     <Compile Include="Extensions\ViewExtensions.cs" />
+    <Compile Include="Helpers\Settings.cs" />
     <Compile Include="Renderers\BadgeView.cs" />
+    <Compile Include="Renderers\CustomNavigationPageRenderer.cs" />
     <Compile Include="Renderers\CustomTabbedPageRenderer.cs" />
     <Compile Include="Renderers\SlideDownMenuPageRenderer.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
@@ -223,6 +233,8 @@
     <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\switch_off.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\switch_on.png" />
     <AndroidResource Include="Resources\layout\Tabs.axml">
       <SubType>Designer</SubType>
     </AndroidResource>
@@ -332,9 +344,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\switch_on.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\switch_on.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\switch_off.png" />
   </ItemGroup>
@@ -342,10 +351,22 @@
     <AndroidResource Include="Resources\drawable-xhdpi\switch_off.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\switch_off.png" />
+    <AndroidResource Include="Resources\drawable\noimage.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable\noimage.png" />
+    <AndroidResource Include="Resources\drawable\default_product.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\banner.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\header_logo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\header_logo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\header_logo.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
@@ -354,9 +375,7 @@
       <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.5.0.0-alpha01\build\StyleCop.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.5.0.0-alpha01\build\StyleCop.MSBuild.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
-  <Import Project="..\..\packages\StyleCop.MSBuild.5.0.0-alpha01\build\StyleCop.MSBuild.targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.5.0.0-alpha01\build\StyleCop.MSBuild.targets')" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config
index 9732eed08..9bbf6e573 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config
@@ -32,6 +32,7 @@
   <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="monoandroid70" />
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="monoandroid70" />
   <package id="Unity" version="4.0.1" targetFramework="monoandroid70" />
+  <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid70" />
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
index 545e3dbfb..bb833177e 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
@@ -16,7 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak
index bb833177e..545e3dbfb 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak
@@ -16,7 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
index 92d3937a4..9f7a21ddc 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
@@ -62,12 +62,6 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
-      <Project>{65116d1c-145b-4693-abda-f0fb6f425191}</Project>
-      <Name>eShopOnContainers.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/banner.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/banner.png
new file mode 100644
index 000000000..1bbb6ffed
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/banner.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Renderers/CustomTabbedPageRenderer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Renderers/CustomTabbedPageRenderer.cs
index 7bde6aab7..50dbef748 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Renderers/CustomTabbedPageRenderer.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Renderers/CustomTabbedPageRenderer.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using Xamarin.Forms;
 using Xamarin.Forms.Internals;
 using Xamarin.Forms.Platform.UWP;
-using UI = Windows.UI;
 using Xaml = Windows.UI.Xaml;
 
 [assembly: ExportRenderer(typeof(TabbedPage), typeof(CustomTabbedPageRenderer))]
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
index 14eb0b5a0..12242a7ab 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>eShopOnContainers.Windows</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -129,6 +129,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\app_settings.png" />
+    <Content Include="Assets\banner.png" />
     <Content Include="Assets\circle_button_background.png" />
     <Content Include="Assets\default_product.png" />
     <Content Include="Assets\fake_product_01.png" />
@@ -173,11 +174,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="WindowsMobile, Version=10.0.14393.0">
+    <SDKReference Include="WindowsMobile, Version=10.0.10586.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
-  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json
index f6ba4a425..65775dfc8 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json
@@ -5,6 +5,7 @@
     "Newtonsoft.Json": "9.0.1",
     "SlideOverKit": "2.1.4",
     "Unity": "4.0.1",
+    "Xam.Plugins.Settings": "2.6.0.12-beta",
     "Xamarin.FFImageLoading": "2.2.6-pre-232",
     "Xamarin.FFImageLoading.Forms": "2.2.6-pre-232",
     "Xamarin.Forms": "2.3.2.127",
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Helpers/Settings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Helpers/Settings.cs
new file mode 100644
index 000000000..7be067fe3
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Helpers/Settings.cs
@@ -0,0 +1,44 @@
+/*
+// Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it.
+using Plugin.Settings;
+using Plugin.Settings.Abstractions;
+
+namespace eShopOnContainers.iOS.Helpers
+{
+  /// <summary>
+  /// This is the Settings static class that can be used in your Core solution or in any
+  /// of your client applications. All settings are laid out the same exact way with getters
+  /// and setters. 
+  /// </summary>
+  public static class Settings
+  {
+    private static ISettings AppSettings
+    {
+      get
+      {
+        return CrossSettings.Current;
+      }
+    }
+
+    #region Setting Constants
+
+    private const string SettingsKey = "settings_key";
+    private static readonly string SettingsDefault = string.Empty;
+
+    #endregion
+
+
+    public static string GeneralSettings
+    {
+      get
+      {
+        return AppSettings.GetValueOrDefault<string>(SettingsKey, SettingsDefault);
+      }
+      set
+      {
+        AppSettings.AddOrUpdateValue<string>(SettingsKey, value);
+      }
+    }
+
+  }
+}*/
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/banner.png b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/banner.png
new file mode 100644
index 000000000..315517826
Binary files /dev/null and b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/banner.png differ
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
index 58a50c5e2..143743fd2 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
@@ -101,6 +101,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Effects\EntryLineColorEffect.cs" />
+    <Compile Include="Helpers\Settings.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />
     <BundleResource Include="..\CommonResources\Fonts\Montserrat-Bold.ttf">
@@ -173,6 +174,14 @@
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Settings.Abstractions, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.dll</HintPath>
       <Private>True</Private>
@@ -372,6 +381,9 @@
   <ItemGroup>
     <BundleResource Include="Resources\default_product.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\banner.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config
index 230bc8511..0ac31e682 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config
@@ -9,6 +9,7 @@
   <package id="Splat" version="1.6.2" targetFramework="xamarinios10" />
   <package id="Unity" version="4.0.1" targetFramework="xamarinios10" />
   <package id="WebP.Touch" version="1.0.2" targetFramework="xamarinios10" />
+  <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading" version="2.2.6-pre-232" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.6-pre-232" targetFramework="xamarinios10" />
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="xamarinios10" />
diff --git a/src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs b/src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
index abb0733b3..64a7cd8eb 100644
--- a/src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
+++ b/src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
@@ -20,7 +20,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers
         }
 
         // GET api/v1/[controller]/items/[?pageSize=3&pageIndex=10]
-
         [HttpGet]
         [Route("[action]")]
         public async Task<IActionResult> Items(int pageSize = 10, int pageIndex = 0)
@@ -41,7 +40,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers
         }
 
         // GET api/v1/[controller]/items/withname/samplename
-
         [HttpGet]
         [Route("[action]/withname/{name:minlength(1)}")]
         public async Task<IActionResult> Items(string name, int pageSize = 10, int pageIndex = 0)
@@ -64,7 +62,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers
         }
 
         // GET api/v1/[controller]/items/type/1/brand/null
-
         [HttpGet]
         [Route("[action]/type/{catalogTypeId}/brand/{catalogBrandId}")]
         public async Task<IActionResult> Items(int? catalogTypeId, int? catalogBrandId, int pageSize = 10, int pageIndex = 0)
@@ -96,7 +93,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers
         }
 
         // GET api/v1/[controller]/CatalogTypes
-
         [HttpGet]
         [Route("[action]")]
         public async Task<IActionResult> CatalogTypes()
@@ -108,7 +104,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers
         }
 
         // GET api/v1/[controller]/CatalogBrands
-
         [HttpGet]
         [Route("[action]")]
         public async Task<IActionResult> CatalogBrands()
diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs
index 3ad04aed4..9655a9e1b 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs
@@ -8,20 +8,14 @@
         public CatalogContext(DbContextOptions options) : base(options)
         {
         }
-
         public DbSet<CatalogItem> CatalogItems { get; set; }
-
         public DbSet<CatalogBrand> CatalogBrands { get; set; }
-
         public DbSet<CatalogType> CatalogTypes { get; set; }
-
         protected override void OnModelCreating(ModelBuilder builder)
         {
             builder.Entity<CatalogBrand>(ConfigureCatalogBrand);
             builder.Entity<CatalogType>(ConfigureCatalogType);
             builder.Entity<CatalogItem>(ConfigureCatalogItem);
-           
-
         }
 
         void ConfigureCatalogItem(EntityTypeBuilder<CatalogItem> builder)
@@ -49,7 +43,6 @@
             builder.HasOne(ci => ci.CatalogType)
                 .WithMany()
                 .HasForeignKey(ci => ci.CatalogTypeId);
-
         }
 
         void ConfigureCatalogBrand(EntityTypeBuilder<CatalogBrand> builder)
@@ -69,7 +62,6 @@
 
         void ConfigureCatalogType(EntityTypeBuilder<CatalogType> builder)
         {
-
             builder.ToTable("CatalogType");
 
             builder.HasKey(ci => ci.Id);
diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
index 28d484d2d..12a4a2529 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
@@ -63,8 +63,10 @@
         {
             return new List<CatalogBrand>()
             {
-                new CatalogBrand() { Brand="Azure"},
-                new CatalogBrand() { Brand = "Visual Studio" }
+                new CatalogBrand() { Brand = "Azure"},
+                new CatalogBrand() { Brand = ".NET" },
+                new CatalogBrand() { Brand = "Visual Studio" },
+                new CatalogBrand() { Brand = "SQL Server" }
             };
         }
 
@@ -72,8 +74,10 @@
         {
             return new List<CatalogType>()
             {
-                new CatalogType() { Type="Mug"},
-                new CatalogType() { Type = "T-Shirt" }
+                new CatalogType() { Type = "Mug"},
+                new CatalogType() { Type = "T-Shirt" },
+                new CatalogType() { Type = "Backpack" },
+                new CatalogType() { Type = "USB Memory Stick" }
             };
         }
 
diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogItem.cs b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogItem.cs
index 0c01486e1..65aafa457 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogItem.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogItem.cs
@@ -1,7 +1,7 @@
-namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure
-{
-    using System;
+using System;
 
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure
+{
     public class CatalogItem
     {
         public int Id { get; set; }
diff --git a/src/Services/Catalog/Catalog.API/Properties/launchSettings.json b/src/Services/Catalog/Catalog.API/Properties/launchSettings.json
index 9c71e8a45..9bc4c1eb0 100644
--- a/src/Services/Catalog/Catalog.API/Properties/launchSettings.json
+++ b/src/Services/Catalog/Catalog.API/Properties/launchSettings.json
@@ -10,6 +10,8 @@
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "/swagger/ui",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs
index 67218969a..b179a24bf 100644
--- a/src/Services/Catalog/Catalog.API/Startup.cs
+++ b/src/Services/Catalog/Catalog.API/Startup.cs
@@ -54,9 +54,9 @@
                 options.DescribeAllEnumsAsStrings();
                 options.SingleApiVersion(new Swashbuckle.Swagger.Model.Info()
                 {
-                    Title = "Catalog HTTP API",
+                    Title = "eShopOnContainers - Catalog HTTP API",
                     Version = "v1",
-                    Description = "The Catalog Service HTTP API",
+                    Description = "The Catalog Microservice HTTP API. This is a Data-Driven/CRUD microservice sample",
                     TermsOfService = "Terms Of Service"
                 });
             });
diff --git a/src/Services/Catalog/Catalog.API/docker-compose.yml b/src/Services/Catalog/Catalog.API/docker-compose.yml
index 2a8432ccc..d08b67180 100644
--- a/src/Services/Catalog/Catalog.API/docker-compose.yml
+++ b/src/Services/Catalog/Catalog.API/docker-compose.yml
@@ -2,10 +2,7 @@ version: '2'
 
 services:
   catalog.api:
-    image: eshop/catalog.api    
-    build:
-    context: .
-    dockerfile: Dockerfile
+    image: eshop/catalog.api
     environment:
       - ConnectionString=Server=catalog.data;Initial Catalog=CatalogData;User Id=sa;Password=Pass@word
     expose:
diff --git a/src/Services/Catalog/Catalog.API/settings.json b/src/Services/Catalog/Catalog.API/settings.json
index f7b554148..bac26f3b5 100644
--- a/src/Services/Catalog/Catalog.API/settings.json
+++ b/src/Services/Catalog/Catalog.API/settings.json
@@ -1,5 +1,5 @@
 {
-  "ConnectionString": "Server=tcp:127.0.0.1,1433;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
+  "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
diff --git a/src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs b/src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs
index 02d209ad0..3cd3f5353 100644
--- a/src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs
+++ b/src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs
@@ -64,7 +64,6 @@
         {
             var order = await _orderQueries.GetOrder(orderId);
 
-            
             return Ok(order);
         }
 
@@ -74,7 +73,6 @@
         {
             var orders = await _orderQueries.GetOrders();
 
-
             return Ok(orders);
         }
 
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs b/src/Services/Ordering/Ordering.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
index 2125fcd7f..3d181cd0c 100644
--- a/src/Services/Ordering/Ordering.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
+++ b/src/Services/Ordering/Ordering.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
@@ -1,9 +1,11 @@
 namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Filters
 {
+    using AspNetCore.Mvc;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc.Filters;
     using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.ActionResults;
     using Microsoft.Extensions.Logging;
+    using System;
 
     public class HttpGlobalExceptionFilter : IExceptionFilter
     {
@@ -22,17 +24,30 @@
                 context.Exception,
                 context.Exception.Message);
 
-            var json = new JsonErrorResponse
+            if (context.Exception.GetType() == typeof(ArgumentException)) //TODO:Select a common exception for application like EshopException
             {
-                Messages = new[] { "An error ocurr.Try it again." }
-            };
+                var json = new JsonErrorResponse
+                {
+                    Messages = new[] { context.Exception.Message }
+                };
 
-            if (env.IsDevelopment())
-            {
-                json.DeveloperMeesage = context.Exception;
+                context.Result = new BadRequestObjectResult(json);
             }
+            else
+            {
+                var json = new JsonErrorResponse
+                {
+                    Messages = new[] { "An error ocurr.Try it again." }
+                };
 
-            context.Result = new InternalServerErrorObjectResult(json);
+                if (env.IsDevelopment())
+                {
+                    json.DeveloperMeesage = context.Exception;
+                }
+
+                context.Result = new InternalServerErrorObjectResult(json);
+            }
+            
         }
 
         private class JsonErrorResponse
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
index 1c2cfa5d9..88123af1a 100644
--- a/src/Services/Ordering/Ordering.API/Startup.cs
+++ b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -45,9 +45,7 @@
 
             services.AddMvc(options =>
             {
-
                 options.Filters.Add(typeof(HttpGlobalExceptionFilter));
-
             }).AddControllersAsServices();
 
             services.AddEntityFrameworkSqlServer()
@@ -74,8 +72,6 @@
 
             services.AddOptions();
 
-
-
             //configure autofac
 
             var container = new ContainerBuilder();
@@ -84,7 +80,6 @@
             container.RegisterModule(new MediatorModule());
             container.RegisterModule(new ApplicationModule());
 
-
             return new AutofacServiceProvider(container.Build());
         }
 
diff --git a/src/Services/Ordering/Ordering.API/project.json b/src/Services/Ordering/Ordering.API/project.json
index f65f41ad6..4eeb12070 100644
--- a/src/Services/Ordering/Ordering.API/project.json
+++ b/src/Services/Ordering/Ordering.API/project.json
@@ -56,7 +56,7 @@
       "wwwroot",
       "Views",
       "Areas/**/Views",
-      "appsettings.json",
+      "settings.json",
       "web.config",
       "docker-compose.yml",
       "docker-compose.debug.yml",
diff --git a/src/Services/Ordering/Ordering.Application/Commands/NewOrderREquestHandler.cs b/src/Services/Ordering/Ordering.Application/Commands/NewOrderREquestHandler.cs
index 2f321a685..dea451bff 100644
--- a/src/Services/Ordering/Ordering.Application/Commands/NewOrderREquestHandler.cs
+++ b/src/Services/Ordering/Ordering.Application/Commands/NewOrderREquestHandler.cs
@@ -30,7 +30,7 @@
         }
         public async Task<bool> Handle(NewOrderRequest message)
         {
-            //find buyer/payment or add a new one 
+            //find buyer/payment or add a new one buyer/payment 
 
             var buyer = await _buyerRepository.FindAsync(message.Buyer);
 
@@ -41,9 +41,11 @@
 
             var payment = GetExistingPaymentOrAddANewOne(buyer, message);
 
-            await _buyerRepository.UnitOfWork.SaveChangesAsync();
+            await _buyerRepository.UnitOfWork
+                .SaveChangesAsync();
+
+            //create order for buyer and payment method
 
-            //create order
             var order = CreateOrder(buyer.Id, payment.Id, 0);
             order.SetAddress( new Address()
             {
@@ -55,7 +57,8 @@
 
             _orderRepository.Add(order);
 
-            var result = await _orderRepository.UnitOfWork.SaveChangesAsync();
+            var result = await _orderRepository.UnitOfWork
+                .SaveChangesAsync();
 
             return result > 0;
         }
diff --git a/src/Services/Ordering/Ordering.Application/Commands/NewOrderRequest.cs b/src/Services/Ordering/Ordering.Application/Commands/NewOrderRequest.cs
index 108a4d98e..ee79d0319 100644
--- a/src/Services/Ordering/Ordering.Application/Commands/NewOrderRequest.cs
+++ b/src/Services/Ordering/Ordering.Application/Commands/NewOrderRequest.cs
@@ -27,9 +27,5 @@
         public int CardTypeId { get; set; }
 
         public string Buyer { get; set; }
-
-        public NewOrderRequest()
-        {
-        }
     }
 }
diff --git a/src/Services/Ordering/Ordering.Application/Queries/OrderQueries.cs b/src/Services/Ordering/Ordering.Application/Queries/OrderQueries.cs
index 97283546e..7697f7262 100644
--- a/src/Services/Ordering/Ordering.Application/Queries/OrderQueries.cs
+++ b/src/Services/Ordering/Ordering.Application/Queries/OrderQueries.cs
@@ -50,6 +50,5 @@
                 return await connection.QueryAsync<dynamic>("SELECT * FROM ordering.cardtypes");
             }
         }
-
     }
 }
diff --git a/test/Services/FunctionalTests/FunctionalTests.xproj b/test/Services/FunctionalTests/FunctionalTests.xproj
index 4851c130c..f42aea110 100644
--- a/test/Services/FunctionalTests/FunctionalTests.xproj
+++ b/test/Services/FunctionalTests/FunctionalTests.xproj
@@ -4,7 +4,6 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>621e7211-58d0-45fd-9600-1cb490bd930e</ProjectGuid>
@@ -13,9 +12,11 @@
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/test/Services/FunctionalTests/Services/Catalog/CatalogScenarioBase.cs b/test/Services/FunctionalTests/Services/Catalog/CatalogScenarioBase.cs
new file mode 100644
index 000000000..2ecf8eff0
--- /dev/null
+++ b/test/Services/FunctionalTests/Services/Catalog/CatalogScenarioBase.cs
@@ -0,0 +1,40 @@
+
+
+namespace FunctionalTests.Services.Catalog
+{
+    using Microsoft.AspNetCore.Hosting;
+    using Microsoft.AspNetCore.TestHost;
+    using Microsoft.eShopOnContainers.Services.Catalog.API;
+    using System.IO;
+
+    public class CatalogScenarioBase
+    {
+        public TestServer CreateServer()
+        {
+            var webHostBuilder = new WebHostBuilder();
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseStartup<Startup>();
+
+            return new TestServer(webHostBuilder);
+        }
+
+        public static class Get
+        {
+            public static string Items = "api/v1/catalog/items";
+
+            public static string Types = "api/v1/catalog/catalogtypes";
+
+            public static string Brands = "api/v1/catalog/catalogbrands";
+
+            public static string Paginated(int pageIndex, int pageCount)
+            {
+                return $"api/v1/catalog/items?pageIndex={pageIndex}&pageSize={pageCount}";
+            }
+
+            public static string Filtered(int catalogTypeId,int catalogBrandId)
+            {
+                return $"api/v1/catalog/items/type/{catalogTypeId}/brand/{catalogBrandId}";
+            }
+        }
+    }
+}
diff --git a/test/Services/FunctionalTests/Services/Catalog/CatalogScenarios.cs b/test/Services/FunctionalTests/Services/Catalog/CatalogScenarios.cs
new file mode 100644
index 000000000..04482528e
--- /dev/null
+++ b/test/Services/FunctionalTests/Services/Catalog/CatalogScenarios.cs
@@ -0,0 +1,69 @@
+namespace FunctionalTests.Services.Catalog
+{
+    using System.Threading.Tasks;
+    using Xunit;
+
+    public class CatalogScenarios
+        :CatalogScenarioBase
+    {
+        [Fact]
+        public async Task Get_get_all_catalogitems_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var response = await server.CreateClient()
+                    .GetAsync(Get.Items);
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task Get_get_paginated_catalog_items_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var response = await server.CreateClient()
+                    .GetAsync(Get.Paginated(0,4));
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task Get_get_filtered_catalog_items_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var response = await server.CreateClient()
+                    .GetAsync(Get.Filtered(1, 1));
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task Get_catalog_types_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var response = await server.CreateClient()
+                    .GetAsync(Get.Types);
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task Get_catalog_brands_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var response = await server.CreateClient()
+                    .GetAsync(Get.Brands);
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+    }
+}
diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarioBase.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarioBase.cs
new file mode 100644
index 000000000..ee069ffc4
--- /dev/null
+++ b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarioBase.cs
@@ -0,0 +1,34 @@
+namespace FunctionalTests.Services.Ordering
+{
+    using Microsoft.AspNetCore.Hosting;
+    using Microsoft.AspNetCore.TestHost;
+    using Microsoft.eShopOnContainers.Services.Ordering.API;
+    using System.IO;
+
+    public class OrderingScenarioBase
+    {
+        public TestServer CreateServer()
+        {
+            var webHostBuilder = new WebHostBuilder();
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseStartup<Startup>();
+
+            return new TestServer(webHostBuilder);
+        }
+
+        public static class Get
+        {
+            public static string Orders = "api/v1/orders";
+
+            public static string OrderBy(int id)
+            {
+                return $"api/v1/orders/{id}";
+            }
+        }
+
+        public static class Post
+        {
+            public static string AddNewOrder = "api/v1/orders/new";
+        }
+    }
+}
diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs
new file mode 100644
index 000000000..a139ab09a
--- /dev/null
+++ b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs
@@ -0,0 +1,100 @@
+namespace FunctionalTests.Services.Ordering
+{
+    using Microsoft.eShopOnContainers.Services.Ordering.API.Models;
+    using Newtonsoft.Json;
+    using System;
+    using System.Net.Http;
+    using System.Text;
+    using System.Threading.Tasks;
+    using Xunit;
+
+    public class OrderingScenarios
+        : OrderingScenarioBase
+    {
+        [Fact]
+        public async Task Get_get_all_stored_orders_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var response = await server.CreateClient()
+                    .GetAsync(Get.Orders);
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task Get_get_order_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var response = await server.CreateClient()
+                    .GetAsync(Get.OrderBy(31));
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task AddNewOrder_add_new_order_and_response_ok_status_code()
+        {
+            using (var server = CreateServer())
+            {
+                var content = new StringContent(BuildOrder(), UTF8Encoding.UTF8, "application/json");
+                var response = await server.CreateClient()
+                    .PostAsync(Post.AddNewOrder, content);
+
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+        [Fact]
+        public async Task AddNewOrder_response_bad_request_if_card_expiration_is_invalid()
+        {
+            using (var server = CreateServer())
+            {
+                var content = new StringContent(BuildOrderWithInvalidExperationTime(), UTF8Encoding.UTF8, "application/json");
+
+                var response = await server.CreateClient()
+                    .PostAsync(Post.AddNewOrder,content);
+
+                Assert.True(response.StatusCode == System.Net.HttpStatusCode.BadRequest);
+            }
+        }
+
+        string BuildOrder()
+        {
+            var order = new NewOrderViewModel()
+            {
+                CardExpiration = DateTime.UtcNow.AddYears(1),
+                CardNumber = "5145-555-5555",
+                CardHolderName = "Jhon Senna",
+                CardSecurityNumber = "232",
+                CardType = "Amex",
+                ShippingCity = "Redmon",
+                ShippingCountry = "USA",
+                ShippingState = "WA",
+                ShippingStreet = "One way"
+            };
+
+            return JsonConvert.SerializeObject(order);
+        }
+        string BuildOrderWithInvalidExperationTime()
+        {
+            var order = new NewOrderViewModel()
+            {
+                CardExpiration = DateTime.UtcNow.AddYears(-1),
+                CardNumber = "5145-555-5555",
+                CardHolderName = "Jhon Senna",
+                CardSecurityNumber = "232",
+                CardType = "Amex",
+                ShippingCity = "Redmon",
+                ShippingCountry = "USA",
+                ShippingState = "WA",
+                ShippingStreet = "One way"
+            };
+
+            return JsonConvert.SerializeObject(order);
+        }
+    }
+}
diff --git a/test/Services/FunctionalTests/project.json b/test/Services/FunctionalTests/project.json
index 864b9a5f3..875295517 100644
--- a/test/Services/FunctionalTests/project.json
+++ b/test/Services/FunctionalTests/project.json
@@ -2,12 +2,27 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "NETStandard.Library": "1.6.0"
+    "xunit": "2.2.0-beta2-build3300",
+    "Ordering.API": "1.0.0-*",
+    "Microsoft.AspNetCore.TestHost": "1.1.0",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029",
+    "Catalog.API": "1.0.0-*"
   },
-
+  "testRunner": "xunit",
   "frameworks": {
-    "netstandard1.6": {
-      "imports": "dnxcore50"
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.1"
+        }
+      }
     }
+  },
+  "publishOptions": {
+    "include": [
+      "settings.json",
+      "web.config"
+    ]
   }
 }
diff --git a/test/Services/FunctionalTests/settings.json b/test/Services/FunctionalTests/settings.json
new file mode 100644
index 000000000..a95b8262f
--- /dev/null
+++ b/test/Services/FunctionalTests/settings.json
@@ -0,0 +1,3 @@
+{
+  "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;"
+}