Merge branch 'sidecar'

Conflicts:
	pom.xml
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/client/discovery/DiscoveryClient.java
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java

pom.xml

@@ -30,6 +30,7 @@
         <module>spring-cloud-netflix-hystrix-dashboard</module>
         <module>spring-cloud-netflix-eureka-server</module>
         <module>spring-cloud-netflix-turbine</module>
+        <module>spring-cloud-netflix-sidecar</module>
         <module>docs</module>
     </modules>
 
@@ -253,10 +254,21 @@
         </dependencies>
     </dependencyManagement>
 
+    <properties>
+        <archaius.version>0.6.3</archaius.version>
+        <eureka.version>1.1.145</eureka.version>
+        <feign.version>6.1.3</feign.version>
+        <hystrix.version>1.4.0-RC5</hystrix.version>
+        <ribbon.version>2.0-RC13</ribbon.version>
+        <turbine.version>1.0.0</turbine.version>
+        <zuul.version>1.0.28</zuul.version>
+        <netflix.rxjava.version>0.20.7</netflix.rxjava.version>
+        <java.version>1.7</java.version>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
@@ -267,15 +279,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <archaius.version>0.6.3</archaius.version>
-        <eureka.version>1.1.145</eureka.version>
-        <feign.version>6.1.3</feign.version>
-        <hystrix.version>1.4.0-RC5</hystrix.version>
-        <ribbon.version>2.0-RC13</ribbon.version>
-        <turbine.version>1.0.0</turbine.version>
-        <zuul.version>1.0.28</zuul.version>
-        <netflix.rxjava.version>0.20.7</netflix.rxjava.version>
-    </properties>
-
 </project>