INTSAMPLES-33 Update to SI RC1 and Spring 3.1

1. Cleanup of pom.xml files
2. Standardizing version numbers
3. Updating dependency versions
4. Cleaning/Standardizing project names
5. Removing Schema versions in XML context files

basic/pom.xml

@@ -5,17 +5,19 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.integration.samples</groupId>
 	<artifactId>basic-samples</artifactId>
-	<version>2.0.0</version>
-	<name>Basic Spring Integration Samples</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Spring Integration Samples - Basic</name>
 	<packaging>pom</packaging>
 
 	<modules>
         <module>amqp</module>
+        <module>control-bus</module>
         <module>enricher</module>
         <module>feed</module>
         <module>file</module>
-        <module>ftp</module>
+        <!-- <module>ftp</module> -->
         <module>helloworld</module>
+        <module>http</module>
         <module>jdbc</module>
         <module>jms</module>
         <module>jmx</module>
@@ -24,6 +26,7 @@
         <module>quote</module>
         <module>sftp</module>
         <module>tcp-client-server</module>
+        <module>testing-examples</module>
         <module>twitter</module>
         <module>ws-inbound-gateway</module>
         <module>ws-outbound-gateway</module>