diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index 29bd029..4876582 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:flow="http://www.springframework.org/schema/webflow-config"
-	xmlns:dwr="http://www.directwebremoting.org/schema/spring-dwr"
-	xmlns:jee="http://www.springframework.org/schema/jee"
-	xmlns:lang="http://www.springframework.org/schema/lang"
-	xmlns:util="http://www.springframework.org/schema/util"
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:flow="http://www.springframework.org/schema/webflow-config"
+	xmlns:dwr="http://www.directwebremoting.org/schema/spring-dwr"
+	xmlns:jee="http://www.springframework.org/schema/jee"
+	xmlns:lang="http://www.springframework.org/schema/lang"
+	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 		http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-1.0.xsd
 		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-2.0.xsd
@@ -17,276 +17,275 @@
 
 	<!-- the application context definition for the SiteWebSpring DispatcherServlet -->
 
-	<bean
-		class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="mappings">
-			<props>
-				<prop key="/main.htm">MainController</prop>
-				<prop key="/submissionArticleOK.htm">
-					SArticleControllerOK
-				</prop>
-				<prop key="/choosePreferenceOK.htm">
-					ChoosePreferenceControllerOK
-				</prop>
-				<prop key="/listArticle.htm">
-					ListArticleController
-				</prop>
-				<prop key="/registerUser.htm">
-					SUserRegistrationController
-				</prop>
-				<prop key="/submissionArticle.htm">
-					SArticleController
-				</prop>
-				<prop key="/choosePreference.htm">
-					ChoosePreferenceController
-				</prop>
-				<prop key="/dispatchArticle.htm">
-					DispatchArticleController
-				</prop>
-				<prop key="/addConference5.htm">
-					AddConferenceController5
-				</prop>
-				<prop key="/addConference4.htm">
-					AddConferenceController4
-				</prop>
-				<prop key="/addConference3.htm">
-					AddConferenceController3
-				</prop>
-				<prop key="/addConference2.htm">
-					AddConferenceController2
-				</prop>
-				<prop key="/addConference.htm">
-					AddConferenceController
-				</prop>
-				<prop key="/evaluation.htm">EvaluationController</prop>
-				<prop key="/createReport.htm">
-					CreateReportController
-				</prop>
-				<prop key="/listConference.htm">
-					ListConferenceController
-				</prop>
-				<prop key="/chooseConference.htm">
-					ChooseConferenceController
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="MainController"
-		class="org.yacos.web.author.controller.MainController" />
-
-	<bean id="SArticleControllerOK"
-		class="org.yacos.web.author.controller.SArticleControllerOK" />
-
-	<bean id="ChoosePreferenceControllerOK"
-		class="org.yacos.web.PCmember.controller.ChoosePreferenceControllerOK" />
-
-	<bean id="ListArticleController"
-		class="org.yacos.web.PCmember.controller.ListArticleController">
-		<property name="articleManager" ref="articleManager" />
-		<property name="sessionService" ref="sessionService" />
-	</bean>
-
-	<bean id="SUserRegistrationController"
-		class="org.yacos.web.system.controller.SUserRegistrationController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="registerUser" />
-		<property name="commandClass"
-			value="org.yacos.web.system.form.FormUser" />
-		<property name="formView" value="registerUser.htm" />
-		<property name="successView" value="listArticle.htm" />
-		<property name="usersManager" ref="usersManager" />
-		<property name="sessionService" ref="sessionService"/>
-	</bean>
-
-	<bean id="SArticleController"
-		class="org.yacos.web.author.controller.SArticleController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="submissionArticle" />
-		<property name="commandClass"
-			value="org.yacos.web.author.form.FormSubmission" />
-		<property name="formView" value="submissionArticle" />
-		<property name="successView" value="listArticle.htm" />
-		<property name="articleManager" ref="articleManager" />
-		<property name="sessionService" ref="sessionService"/>
-	</bean>
-
-	<bean id="ChoosePreferenceController"
-		class="org.yacos.web.PCmember.controller.ChoosePreferenceController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="choosePreference" />
-		<property name="commandClass"
-			value="org.yacos.web.PCmember.form.FormPreference" />
-		<property name="formView" value="choosePreference" />
-		<property name="successView" value="choosePreference.htm" />
-		<property name="articleManager" ref="articleManager" />
-		<property name="usersManager" ref="usersManager" />
-	    <property name="conferenceManager" ref="conferenceManager" />
-		<property name="sessionService" ref="sessionService"/>
-	</bean>
-
-	<bean id="DispatchArticleController"
-		class="org.yacos.web.PCmember.controller.DispatchArticleController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="formDispatcher" />
-		<property name="commandClass"
-			value="org.yacos.web.PCmember.form.FormDispatcher" />
-		<property name="formView" value="dispatchArticle" />
-		<property name="successView" value="dispatchArticle.htm" />
-		<property name="articleManager" ref="articleManager" />
-		<property name="sessionService" ref="sessionService"/>
-	</bean>
-
-	<bean id="AddConferenceController5"
-		class="org.yacos.web.chairman.controller.AddConferenceController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="formConference" />
-		<property name="commandClass"
-			value="org.yacos.web.chairman.form.FormConference" />
-		<property name="conferenceManager" ref="conferenceManager" />
-	</bean>
-
-	<bean id="AddConferenceController4"
-		class="org.yacos.web.chairman.controller.AddConferenceController">
-		<dwr:remote javascript="AddCriteriaJS" />
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="formConference" />
-		<property name="commandClass"
-			value="org.yacos.web.chairman.form.FormConference" />
-		<property name="conferenceManager" ref="conferenceManager" />
-	</bean>
-
-	<bean id="AddConferenceController3"
-		class="org.yacos.web.chairman.controller.AddConferenceController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="formConference" />
-		<property name="commandClass"
-			value="org.yacos.web.chairman.form.FormConference" />
-		<property name="conferenceManager" ref="conferenceManager" />
-	</bean>
-
-	<bean id="AddConferenceController2"
-		class="org.yacos.web.chairman.controller.AddConferenceController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="formConference" />
-		<property name="commandClass"
-			value="org.yacos.web.chairman.form.FormConference" />
-		<property name="conferenceManager" ref="conferenceManager" />
-	</bean>
-
-	<bean id="AddConferenceController"
-		class="org.yacos.web.chairman.controller.AddConferenceController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="formConference" />
-		<property name="commandClass"
-			value="org.yacos.web.chairman.form.FormConference" />
-		<property name="conferenceManager" ref="conferenceManager" />
-	</bean>
-
-	<bean id="EvaluationController"
-		class="org.yacos.web.PCmember.controller.EvaluationController">
-		<property name="sessionForm" value="true" />
-		<property name="commandName" value="evaluationForm" />
-		<property name="commandClass"
-			value="org.yacos.web.PCmember.form.FormEvaluation" />
-		<property name="formView" value="evaluation" />
-		<property name="successView" value="createReport.htm" />
-		<property name="articleManager" ref="articleManager" />
-		<property name="usersManager" ref="usersManager" />
-		<property name="conferenceManager" ref="conferenceManager" />
-	</bean>
-
-	<bean id="CreateReportController"
-		class="org.yacos.web.PCmember.controller.CreateReportController">
-
-		<property name="articleManager" ref="articleManager" />
-	</bean>
-
-	<!-- List all conference -->
-	<bean id="ListConferenceController"
-		class="org.yacos.web.system.controller.ListConferenceController">
-		<property name="conferenceManager" ref="conferenceManager" />
-	</bean>
-
-	<!-- Get chosen conference in session context -->
-	<bean id="ChooseConferenceController"
-		class="org.yacos.web.system.controller.ChooseConferenceController">
-		<property name="sessionService" ref="sessionService" />
-	</bean>
-
-
-	<bean id="dwrUrlMapping"
-		class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="alwaysUseFullPath" value="true" />
-		<property name="mappings">
-			<props>
-				<prop key="/dwr/**/*">dwrController</prop>
-			</props>
-		</property>
-	</bean>
-
-
-
-
-
-	<dwr:controller id="dwrController" debug="true"></dwr:controller>
-	<dwr:configuration>
-		<dwr:convert type="bean"
-			class="org.yacos.web.chairman.form.FormConference">
-		</dwr:convert>
-
-		<dwr:convert type="bean"
-			class="org.yacos.web.chairman.controller.CriterionBean">
-		</dwr:convert>
-
-
-
-
-		<!-- <dwr:convert type="bean"
-			class="iConfWeb.bean.viewPaper.DetailPaper">
-			</dwr:convert>
-			<dwr:convert type="bean"
-			class="iConfWeb.bean.assignation.PcMemberBean">
-			</dwr:convert>
-			<dwr:convert type="bean"
-			class="iConfWeb.bean.assignation.Assignations">
-			</dwr:convert> -->
-		<dwr:convert type="bean" class="java.lang.StackTraceElement"></dwr:convert>
-		<dwr:convert type="exception" class="java.lang.exception"></dwr:convert>
-
-	</dwr:configuration>
-
-
-	<!-- View Resolver -->
-	<bean id="viewResolver"
-		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="viewClass"
-			value="org.springframework.web.servlet.view.JstlView">
-		</property>
-		<property name="prefix" value="/WEB-INF/jsp/"></property>
-		<property name="suffix" value=".jsp"></property>
+	<bean
+		class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+		<property name="mappings">
+			<props>
+				<prop key="/main.htm">MainController</prop>
+				<prop key="/submissionArticleOK.htm">
+					SArticleControllerOK
+				</prop>
+				<prop key="/choosePreferenceOK.htm">
+					ChoosePreferenceControllerOK
+				</prop>
+				<prop key="/listArticle.htm">
+					ListArticleController
+				</prop>
+				<prop key="/registerUser.htm">
+					SUserRegistrationController
+				</prop>
+				<prop key="/submissionArticle.htm">
+					SArticleController
+				</prop>
+				<prop key="/choosePreference.htm">
+					ChoosePreferenceController
+				</prop>
+				<prop key="/dispatchArticle.htm">
+					DispatchArticleController
+				</prop>
+				<prop key="/addConference5.htm">
+					AddConferenceController5
+				</prop>
+				<prop key="/addConference4.htm">
+					AddConferenceController4
+				</prop>
+				<prop key="/addConference3.htm">
+					AddConferenceController3
+				</prop>
+				<prop key="/addConference2.htm">
+					AddConferenceController2
+				</prop>
+				<prop key="/addConference.htm">
+					AddConferenceController
+				</prop>
+				<prop key="/evaluation.htm">EvaluationController</prop>
+				<prop key="/createReport.htm">
+					CreateReportController
+				</prop>
+				<prop key="/listConference.htm">
+					ListConferenceController
+				</prop>
+				<prop key="/chooseConference.htm">
+					ChooseConferenceController
+				</prop>
+			</props>
+		</property>
 	</bean>
-	
-	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+
+	<bean id="MainController"
+		class="org.yacos.web.author.controller.MainController" />
+
+	<bean id="SArticleControllerOK"
+		class="org.yacos.web.author.controller.SArticleControllerOK" />
+
+	<bean id="ChoosePreferenceControllerOK"
+		class="org.yacos.web.PCmember.controller.ChoosePreferenceControllerOK" />
+
+	<bean id="ListArticleController"
+		class="org.yacos.web.PCmember.controller.ListArticleController">
+		<property name="articleManager" ref="articleManager" />
+		<property name="sessionService" ref="sessionService" />
+	</bean>
+
+	<bean id="SUserRegistrationController"
+		class="org.yacos.web.system.controller.SUserRegistrationController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="registerUser" />
+		<property name="commandClass"
+			value="org.yacos.web.system.form.FormUser" />
+		<property name="formView" value="registerUser.htm" />
+		<property name="successView" value="listArticle.htm" />
+		<property name="usersManager" ref="usersManager" />
+		<property name="sessionService" ref="sessionService" />
+	</bean>
+
+	<bean id="SArticleController"
+		class="org.yacos.web.author.controller.SArticleController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="submissionArticle" />
+		<property name="commandClass"
+			value="org.yacos.web.author.form.FormSubmission" />
+		<property name="formView" value="submissionArticle" />
+		<property name="successView" value="listArticle.htm" />
+		<property name="articleManager" ref="articleManager" />
+	</bean>
+
+	<bean id="ChoosePreferenceController"
+		class="org.yacos.web.PCmember.controller.ChoosePreferenceController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="choosePreference" />
+		<property name="commandClass"
+			value="org.yacos.web.PCmember.form.FormPreference" />
+		<property name="formView" value="choosePreference" />
+		<property name="successView" value="choosePreference.htm" />
+		<property name="articleManager" ref="articleManager" />
+		<property name="usersManager" ref="usersManager" />
+		<property name="conferenceManager" ref="conferenceManager" />
+		<property name="sessionService" ref="sessionService" />
+	</bean>
+
+	<bean id="DispatchArticleController"
+		class="org.yacos.web.PCmember.controller.DispatchArticleController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="formDispatcher" />
+		<property name="commandClass"
+			value="org.yacos.web.PCmember.form.FormDispatcher" />
+		<property name="formView" value="dispatchArticle" />
+		<property name="successView" value="dispatchArticle.htm" />
+		<property name="articleManager" ref="articleManager" />
+		<property name="sessionService" ref="sessionService" />
+	</bean>
+
+	<bean id="AddConferenceController5"
+		class="org.yacos.web.chairman.controller.AddConferenceController">
+		<dwr:remote javascript="AddCriteriaJS" />
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="formConference" />
+		<property name="commandClass"
+			value="org.yacos.web.chairman.form.FormConference" />
+		<property name="conferenceManager" ref="conferenceManager" />
+		<property name="usersManager" ref="usersManager" />
+	</bean>
+
+	<bean id="AddConferenceController4"
+		class="org.yacos.web.chairman.controller.AddConferenceController">
+		<dwr:remote javascript="AddCriteriaJS" />
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="formConference" />
+		<property name="commandClass"
+			value="org.yacos.web.chairman.form.FormConference" />
+		<property name="conferenceManager" ref="conferenceManager" />
+		<property name="usersManager" ref="usersManager" />
+	</bean>
+
+	<bean id="AddConferenceController3"
+		class="org.yacos.web.chairman.controller.AddConferenceController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="formConference" />
+		<property name="commandClass"
+			value="org.yacos.web.chairman.form.FormConference" />
+		<property name="conferenceManager" ref="conferenceManager" />
+		<property name="usersManager" ref="usersManager" />
+	</bean>
+
+	<bean id="AddConferenceController2"
+		class="org.yacos.web.chairman.controller.AddConferenceController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="formConference" />
+		<property name="commandClass"
+			value="org.yacos.web.chairman.form.FormConference" />
+		<property name="conferenceManager" ref="conferenceManager" />
+		<property name="usersManager" ref="usersManager" />
+	</bean>
+
+	<bean id="AddConferenceController"
+		class="org.yacos.web.chairman.controller.AddConferenceController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="formConference" />
+		<property name="commandClass"
+			value="org.yacos.web.chairman.form.FormConference" />
+		<property name="conferenceManager" ref="conferenceManager" />
+		<property name="usersManager" ref="usersManager" />
+	</bean>
+
+	<bean id="EvaluationController"
+		class="org.yacos.web.PCmember.controller.EvaluationController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="evaluationForm" />
+		<property name="commandClass"
+			value="org.yacos.web.PCmember.form.FormEvaluation" />
+		<property name="formView" value="evaluation" />
+		<property name="successView" value="createReport.htm" />
+		<property name="articleManager" ref="articleManager" />
+		<property name="usersManager" ref="usersManager" />
+		<property name="conferenceManager" ref="conferenceManager" />
+	</bean>
+
+	<bean id="CreateReportController"
+		class="org.yacos.web.PCmember.controller.CreateReportController">
+
+		<property name="articleManager" ref="articleManager" />
+	</bean>
+
+	<!-- List all conference -->
+	<bean id="ListConferenceController"
+		class="org.yacos.web.system.controller.ListConferenceController">
+		<property name="conferenceManager" ref="conferenceManager" />
+	</bean>
+
+	<!-- Get chosen conference in session context -->
+	<bean id="ChooseConferenceController"
+		class="org.yacos.web.system.controller.ChooseConferenceController">
+		<property name="sessionService" ref="sessionService" />
+	</bean>
+
+
+	<bean id="dwrUrlMapping"
+		class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+		<property name="alwaysUseFullPath" value="true" />
+		<property name="mappings">
+			<props>
+				<prop key="/dwr/**/*">dwrController</prop>
+			</props>
+		</property>
+	</bean>
+
+
+
+
+
+	<dwr:controller id="dwrController" debug="true"></dwr:controller>
+	<dwr:configuration>
+		<dwr:convert type="bean"
+			class="org.yacos.web.chairman.form.FormConference">
+		</dwr:convert>
+
+		<dwr:convert type="bean"
+			class="org.yacos.web.chairman.controller.CriterionBean">
+		</dwr:convert>
+		
+		<dwr:convert type="bean"
+			class="org.yacos.web.chairman.controller.PersonBean">
+		</dwr:convert>
+
+		<dwr:convert type="bean" class="java.lang.StackTraceElement"></dwr:convert>
+		<dwr:convert type="exception" class="java.lang.exception"></dwr:convert>
+
+	</dwr:configuration>
+
+
+	<!-- View Resolver -->
+	<bean id="viewResolver"
+		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="viewClass"
+			value="org.springframework.web.servlet.view.JstlView">
+		</property>
+		<property name="prefix" value="/WEB-INF/jsp/"></property>
+		<property name="suffix" value=".jsp"></property>
+	</bean>
+
+	<bean id="multipartResolver"
+		class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
 		<property name="maxUploadSize" value="10000000" />
 	</bean>
-	
-	<bean id="messageSource"
-		class="org.springframework.context.support.ResourceBundleMessageSource">
-		<property name="basename" value="messages" />
+
+	<bean id="messageSource"
+		class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename" value="messages" />
 	</bean>
-	
-	
-	<bean id="sessionService" class="org.yacos.web.system.controller.SessionService">
-		<property name="conferenceManager" ref="conferenceManager"/>
-		<property name="userManager" ref="usersManager"/>
+
+
+	<bean id="sessionService"
+		class="org.yacos.web.system.controller.SessionService">
+		<property name="conferenceManager" ref="conferenceManager" />
+		<property name="userManager" ref="usersManager" />
 	</bean>
-	
+
 	<!-- EJB Services Linking -->
-		<jee:jndi-lookup id="articleManager"
+	<jee:jndi-lookup id="articleManager"
 		jndi-name="ArticleManagerBean/remote" cache="true" />
 	<jee:jndi-lookup id="usersManager"
 		jndi-name="UserManagerBean/remote" cache="true" />
 	<jee:jndi-lookup id="conferenceManager"
-		jndi-name="ConferenceManagerBean/remote" cache="true" />
+		jndi-name="ConferenceManagerBean/remote" cache="true" />
 </beans>
\ No newline at end of file