changes
Merge https://github.com/kseinya/PEACE

Conflicts:
	SampleWebApp.v11.suo
	SampleWebApp/Database/Queries.cs
	SampleWebApp/Models/Sidebar.cs
	SampleWebApp/SampleWebApp.csproj.user
	SampleWebApp/Views/Shared/_Sidebar.cshtml
	SampleWebApp/bin/SampleWebApp.dll
	SampleWebApp/bin/SampleWebApp.pdb
	SampleWebApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SampleWebApp/obj/Debug/SampleWebApp.csproj.FileListAbsolute.txt
	SampleWebApp/obj/Debug/SampleWebApp.csprojResolveAssemblyReference.cache
	SampleWebApp/obj/Debug/SampleWebApp.dll
	SampleWebApp/obj/Debug/SampleWebApp.pdb
somethign
Merge https://github.com/kseinya/PEACE

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