diff --git a/pom.xml b/pom.xml
index a8db6f144..f47373f1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,15 +57,17 @@
 		<jodatime.version>2.5</jodatime.version>
 		<jadira-usertype-core.version>3.2.0.GA</jadira-usertype-core.version>
 
-
 		<!-- Web dependencies -->
 		<webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
 		<webjars-jquery-ui.version>1.10.3</webjars-jquery-ui.version>
 		<webjars-jquery.version>2.0.3-1</webjars-jquery.version>
 		<dandelion.version>0.10.1</dandelion.version>
+		<webjars-angular-ui-bootstrap>0.12.0</webjars-angular-ui-bootstrap>
 
 		<mysql.version>5.1.22</mysql.version>
-
+		
+		<!-- Jackson -->
+		<com.fasterxml.jackson-version>2.3.1</com.fasterxml.jackson-version>
 	</properties>
 
 	<dependencies>
@@ -264,6 +266,11 @@
 			<artifactId>jquery</artifactId>
 			<version>${webjars-jquery.version}</version>
 		</dependency>
+		<dependency>
+		    <groupId>org.webjars</groupId>
+		    <artifactId>angular-ui-bootstrap</artifactId>
+		    <version>${webjars-angular-ui-bootstrap}</version>
+		</dependency>
 		
 		<!-- Test Artifacts -->
 		<dependency>
@@ -310,6 +317,24 @@
 			<artifactId>datatables-export-itext</artifactId>
 			<version>${dandelion.version}</version>
 		</dependency>
+		
+		<!-- Jackson2 -->
+		<dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-core</artifactId>
+		    <version>${com.fasterxml.jackson-version}</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-databind</artifactId>
+		    <version>${com.fasterxml.jackson-version}</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.fasterxml.jackson.datatype</groupId>
+		    <artifactId>jackson-datatype-joda</artifactId>
+		    <version>${com.fasterxml.jackson-version}</version>
+		</dependency>
+		
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
diff --git a/src/main/resources/spring/mvc-core-config.xml b/src/main/resources/spring/mvc-core-config.xml
index 396fcff10..ca4b42301 100644
--- a/src/main/resources/spring/mvc-core-config.xml
+++ b/src/main/resources/spring/mvc-core-config.xml
@@ -21,25 +21,24 @@
     <context:component-scan
             base-package="org.springframework.samples.petclinic.web, org.springframework.samples.petclinic.rest"/>
 
+
+	<bean id="objectMapper" class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean" 
+			p:indentOutput="true" p:simpleDateFormat="yyyy-MM-dd'T'HH:mm:ss.SSSZ">
+	</bean>
+	
+	<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"
+	    	p:targetObject-ref="objectMapper" p:targetMethod="registerModule">
+	    <property name="arguments">
+	        <list>
+	            <bean class="com.fasterxml.jackson.datatype.joda.JodaModule" />
+	        </list>
+	    </property>
+	</bean>
+
     <mvc:annotation-driven conversion-service="conversionService" >
     	<mvc:message-converters>
-    		<bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
-    			<property name="objectMapper" >
-				    <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
-						<property name="featuresToDisable">
-							<array>
-								<util:constant
-									static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE" />
-								<util:constant
-									static-field="com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS" />
-								<util:constant
-									static-field="com.fasterxml.jackson.databind.SerializationFeature.FAIL_ON_EMPTY_BEANS" />
-							</array>
-						</property>
-						<property name="serializationInclusion" value="NON_NULL" />
-						<property name="simpleDateFormat" value="yyyy-MM-dd'T'HH:mm:ssZ" />
-					</bean>
-    			</property>
+    		<bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter" >
+    			<property name="objectMapper" ref="objectMapper" />
     		</bean>
     	</mvc:message-converters>
     </mvc:annotation-driven>