diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml
index 84273a0..ea56105 100644
--- a/booking-faces/pom.xml
+++ b/booking-faces/pom.xml
@@ -11,7 +11,7 @@
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
 		<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
-		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
+		<webflow-version>2.4.0.M1</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
 		<mojarra-version>2.1.7</mojarra-version>
 		<primefaces-version>3.1.1</primefaces-version>
@@ -20,8 +20,8 @@
 	<repositories>
 		<repository>
 			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
+			<name>SpringSource Repository</name>
+			<url>http://repo.springsource.org/milestone</url>
 		</repository>
 		<repository>
 			<id>primefaces-repository</id>
diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 3448b7e..3c17ea0 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -11,8 +11,8 @@
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
 		<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
-		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
-		<slf4j-version>1.5.10</slf4j-version>
+		<webflow-version>2.4.0.M1</webflow-version>
+		<slf4j-version>1.6.1</slf4j-version>
 		<thymeleaf-version>2.0.15</thymeleaf-version>
 		<thymeleaf-extras-tiles2-version>2.0.0</thymeleaf-extras-tiles2-version>
 		<thymeleaf-extras-springsecurity3-version>2.0.0</thymeleaf-extras-springsecurity3-version>
@@ -23,8 +23,8 @@
 	<repositories>
 		<repository>
 			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
+			<name>SpringSource Repository</name>
+			<url>http://repo.springsource.org/milestone</url>
 		</repository>
 	</repositories>
 
@@ -51,8 +51,18 @@
 			<artifactId>thymeleaf-extras-springsecurity3</artifactId>
 			<version>${thymeleaf-extras-springsecurity3-version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf.extras</groupId>
+			<artifactId>thymeleaf-extras-conditionalcomments</artifactId>
+			<version>${thymeleaf-extras-conditionalcomments-version}</version>
+		</dependency>
 		
 		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${springframework-version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
@@ -85,7 +95,7 @@
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>
-					<artifactId>*</artifactId>
+					<artifactId>spring-aop</artifactId>
 				 </exclusion>
 			</exclusions>
 		</dependency>
@@ -96,7 +106,7 @@
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>
-					<artifactId>*</artifactId>
+					<artifactId>spring-aop</artifactId>
 				 </exclusion>
 			</exclusions>
 		</dependency>
@@ -107,7 +117,7 @@
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>
-					<artifactId>*</artifactId>
+					<artifactId>spring-aop</artifactId>
 				 </exclusion>
 			</exclusions>						
         </dependency>	
@@ -295,7 +305,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.8</version>
+				<version>2.9</version>
 				<configuration>
 					<downloadSources>true</downloadSources>
 					<downloadJavadocs>false</downloadJavadocs>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 2bdfa4e..394aece 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -23,20 +23,6 @@
 	<mvc:view-controller path="/login" />
 	<mvc:view-controller path="/logoutSuccess" />
 
-	<!-- Resolves logical view names returned by Controllers to Tiles; a view name to resolve is treated as the name of a tiles definition -->
-	<bean id="tilesViewResolver" class="org.springframework.js.ajax.AjaxUrlBasedViewResolver">
-		<property name="viewClass" value="org.springframework.webflow.mvc.view.FlowAjaxTilesView"/>
-	</bean>
-
-	<!-- Configures the Tiles layout system -->
-	<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
-		<property name="definitions">
-			<list>
-				<value>/WEB-INF/**/views.xml</value>
-			</list>
-		</property>
-	</bean>
-	
 	<!-- Dispatches requests mapped to flows to FlowHandler implementations -->
 	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter">
 		<property name="flowExecutor" ref="flowExecutor"/>
diff --git a/booking-portlet-faces/pom.xml b/booking-portlet-faces/pom.xml
index c0e4f4f..99b5b87 100644
--- a/booking-portlet-faces/pom.xml
+++ b/booking-portlet-faces/pom.xml
@@ -10,7 +10,7 @@
 
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
-		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
+		<webflow-version>2.4.0.M1</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
 		<myfaces-version>2.1.6</myfaces-version>
 	</properties>
@@ -18,8 +18,8 @@
 	<repositories>
 		<repository>
 			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
+			<name>SpringSource Repository</name>
+			<url>http://repo.springsource.org/milestone</url>
 		</repository>
 	</repositories>
 
diff --git a/booking-portlet-mvc/pom.xml b/booking-portlet-mvc/pom.xml
index 310a22c..ba1d1b1 100644
--- a/booking-portlet-mvc/pom.xml
+++ b/booking-portlet-mvc/pom.xml
@@ -10,15 +10,15 @@
 
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
-		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
+		<webflow-version>2.4.0.M1</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
 	</properties>
 
 	<repositories>
 		<repository>
 			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
+			<name>SpringSource Repository</name>
+			<url>http://repo.springsource.org/milestone</url>
 		</repository>
 	</repositories>