Merge remote branch 'kpb/master' into INTSAMPLES-31

basic/amqp/pom.xml

@@ -24,10 +24,15 @@
             <url>http://maven.springframework.org/release</url>
         </repository>
         <repository>
-            <id>repository.springframework.maven.snapshot</id>
-            <name>Spring Framework Maven Release Repository</name>
-            <url>http://maven.springframework.org/snapshot</url>
-        </repository>
+            <id>repository.springframework.maven.milestone</id>
+			<name>Spring Framework Maven Milestone Repository</name>
+			<url>http://maven.springframework.org/milestone</url>
+		</repository>
+		<repository>
+			<id>repository.springframework.maven.snapshot</id>
+			<name>Spring Framework Maven Snapshot Repository</name>
+			<url>http://maven.springframework.org/snapshot</url>
+		</repository>
     </repositories>
 
     <build>

basic/pom.xml

@@ -10,6 +10,7 @@
 	<packaging>pom</packaging>
 
 	<modules>
+        <module>amqp</module>
         <module>feed</module>
         <module>file</module>
         <module>ftp</module>