Merge remote-tracking branch 'origin/master'

Conflicts:

	ProjectGallery/Forum.WebClient/obj/Debug/Forum.WebClient.csproj.FileListAbsolute.txt
	ProjectGallery/ProjectGallery.Data/bin/Debug/ProjectGallery.Data.dll
	ProjectGallery/ProjectGallery.Data/bin/Debug/ProjectGallery.Data.pdb

	ProjectGallery/ProjectGallery.Data/obj/Debug/ProjectGallery.Data.csprojResolveAssemblyReference.cache
	ProjectGallery/ProjectGallery.Data/obj/Debug/ProjectGallery.Data.dll
	ProjectGallery/ProjectGallery.Data/obj/Debug/ProjectGallery.Data.pdb

	ProjectGallery/ProjectGallery.Services/Controllers/CategoriesController.cs
	ProjectGallery/ProjectGallery.Services/bin/ProjectGallery.Data.dll
	ProjectGallery/ProjectGallery.Services/bin/ProjectGallery.Data.pdb
	ProjectGallery/ProjectGallery.Services/bin/ProjectGallery.Services.dll
	ProjectGallery/ProjectGallery.Services/bin/ProjectGallery.Services.pdb

	ProjectGallery/ProjectGallery.Services/obj/Debug/ProjectGallery.Services.csprojResolveAssemblyReference.cache

	ProjectGallery/ProjectGallery.Services/obj/Debug/ProjectGallery.Services.dll

	ProjectGallery/ProjectGallery.Services/obj/Debug/ProjectGallery.Services.pdb
	ProjectGallery/ProjectGallery.v12.suo