diff --git a/.classpath b/.classpath
index 7351906c0..287449602 100644
--- a/.classpath
+++ b/.classpath
@@ -13,7 +13,11 @@
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/com.springsource.org.aopalliance-1.0.0.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/commons-beanutils-1.8.2.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="/LibreriasAdmVenta/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="/LibreriasAdmVenta/commons-collections-3.2.1.jar" sourcepath="C:/Users/gleimar/Downloads/commons-collections-3.2.1-src.zip">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:file:/C:/Users/gleimar/Downloads/commons-collections-3.2.1-bin.zip!/commons-collections-3.2.1/apidocs"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/commons-digester-1.7.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/commons-fileupload.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/commons-io.jar"/>
@@ -48,13 +52,25 @@
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.beans-3.0.6.RELEASE.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.context-3.0.6.RELEASE.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.context.support-3.0.6.RELEASE.jar"/>
-	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.core-3.0.6.RELEASE.jar"/>
+	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.core-3.0.6.RELEASE.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:file:/C:/Users/gleimar/Downloads/spring-framework-3.0.6.RELEASE-with-docs.zip!/spring-framework-3.0.6.RELEASE/docs/javadoc-api"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.expression-3.0.6.RELEASE.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.instrument-3.0.6.RELEASE.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.instrument.tomcat-3.0.6.RELEASE.jar"/>
-	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.jdbc-3.0.6.RELEASE.jar"/>
+	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.jdbc-3.0.6.RELEASE.jar" sourcepath="C:/Users/gleimar/Downloads/spring-framework-3.0.6.RELEASE-with-docs.zip">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:file:/C:/Users/gleimar/Downloads/spring-framework-3.0.6.RELEASE-with-docs.zip!/spring-framework-3.0.6.RELEASE/docs/javadoc-api"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.jms-3.0.6.RELEASE.jar"/>
-	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.orm-3.0.6.RELEASE.jar"/>
+	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.orm-3.0.6.RELEASE.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:file:/C:/Users/gleimar/Downloads/spring-framework-3.0.6.RELEASE-with-docs.zip!/spring-framework-3.0.6.RELEASE/docs"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.oxm-3.0.6.RELEASE.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.test-3.0.6.RELEASE.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.transaction-3.0.6.RELEASE.jar"/>
@@ -85,7 +101,7 @@
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-4.5.0.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/jfreechart-1.0.12.jar"/>
 	<classpathentry kind="lib" path="/LibreriasAdmVenta/poi-3.8-20120326.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/.project b/.project
index ce2331f5d..264155d9b 100644
--- a/.project
+++ b/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.zeroturnaround.eclipse.rebelXmlBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
@@ -32,5 +37,6 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipselabs.tapiji.tools.core.nature</nature>
+		<nature>org.zeroturnaround.eclipse.jrebelNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 8a3efe19e..b069b576d 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="JBoss 6.0 Runtime"/>
+  <runtime name="JBoss 6.x Runtime"/>
   <fixed facet="jst.utility"/>
   <fixed facet="java"/>
   <installed facet="java" version="1.6"/>