merge feed reader api

Conflicts:
	nuget-server/nuget-server.iml
	nuget-server/src/META-INF/build-server-plugin-nuget.xml

diff --cc nuget-server/nuget-server.iml
index 36c800563f2f7658d4a02937f9a4b200af7e457b,0f769ff91571929f7496c248e83bf8a4be58b893..dc8180215bb7a0d392f81c45f7be404ec77508b8
--- 1/nuget-server/nuget-server.iml
--- 2/nuget-server/nuget-server.iml
+++ b/nuget-server/nuget-server.iml
@@@ -38,7 -38,7 +38,8 @@@
      <orderEntry type="library" name="Servlet Api" level="project" />\r
      <orderEntry type="module" module-name="nuget-common" />\r
      <orderEntry type="library" name="Common-Impl" level="project" />\r
 +    <orderEntry type="library" name="TeamCity server runtime" level="project" />\r
+     <orderEntry type="library" name="commons-http" level="project" />\r
    </component>\r
  </module>\r
  \r

diff --cc nuget-server/src/META-INF/build-server-plugin-nuget.xml
index 61359ed61a4233e5c62bef8a24c32201f30731c1,1244732783466105c614380d1418024a2911216e..7ed537ef34e84c18ef2ee7846e1e80455232fe30
--- 1/nuget-server/src/META-INF/build-server-plugin-nuget.xml
--- 2/nuget-server/src/META-INF/build-server-plugin-nuget.xml
+++ b/nuget-server/src/META-INF/build-server-plugin-nuget.xml
@@@ -32,11 -32,10 +32,21 @@@
    <bean class="jetbrains.buildServer.nuget.server.publish.PublishRunType"/>\r
  \r
  \r
 -\r
++
 +  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.PermissionChecker"/>\r
 +  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.ServerSettingsTab"/>\r
 +  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.InstalledToolsController"/>\r
 +  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.tab.InstallToolController"/>\r
 +\r
 +\r
 +  <bean class="jetbrains.buildServer.nuget.server.toolRegistry.impl.NuGetToolManagerImpl"/>\r
++
++
++
+   <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.FeedHttpClientHolder" destroy-method="dispose"/>\r
+   <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.NuGetFeedReaderImpl"/>\r
+   <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.FeedGetMethodFactory"/>\r
+   <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.PackagesFeedParserImpl"/>\r
+   <bean class="jetbrains.buildServer.nuget.server.feed.reader.impl.UrlResolverImpl"/>\r
++
  </beans>