Merge branch 'development' of https://git01.codeplex.com/casablanca into http_misc

Author: stgates

Release/include/cpprest/http_client.h

@@ -376,7 +376,7 @@ class http_client
     /// </summary>
     /// <returns>
     /// A base uri initialized in constructor
-    /// </return>
+    /// </returns>
     _ASYNCRTIMP const uri& base_uri() const;
 
     /// <summary>

Release/src/build/vs14/casablanca140.vcxproj

@@ -44,7 +44,7 @@
       <AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <AdditionalOptions>-Zm160 /bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-Zm200 /bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>Winhttp.lib;httpapi.lib;bcrypt.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>