Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115

liquidnet-bus-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/api/FeignAdamBaseClient.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Component
 @FeignClient(name = "liquidnet-service-adam",
         contextId = "FeignAdamBaseClient", path = "adam",
-        url = "http://127.0.0.1:9001",
+        url = "${liquidnet.service.adam.url}",
         fallback = FallbackFactory.Default.class)
 public interface FeignAdamBaseClient {