--- a/server/src/main/webapp/WEB-INF/spring-servlet.xml	Tue Jan 01 09:28:03 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/spring-servlet.xml	Mon Jan 14 16:00:07 2013 +0100
@@ -15,8 +15,10 @@
     <!-- RESOURCE FOLDERS CONFIGURATION -->
     <!-- Dispatcher configuration for serving static resources -->
     <!-- **************************************************************** -->
-    <mvc:resources location="/images/" mapping="/images/**" />
-    <mvc:resources location="/css/" mapping="/css/**" />
+    <mvc:resources location="/static/" mapping="/static/**" />
+    <mvc:resources location="/lib/" mapping="/lib/**" />
+    <mvc:resources location="/_firebug/" mapping="/_firebug/**" />
+    <!--mvc:resources location="/css/" mapping="/css/**" /-->
 
     <!-- **************************************************************** -->
     <!-- SPRING ANNOTATION PROCESSING -->
@@ -38,6 +40,7 @@
         <property name="prefix" value="/WEB-INF/templates/" />
         <property name="suffix" value=".html" />
         <property name="templateMode" value="HTML5" />
+        <property name="characterEncoding" value="UTF-8" />
         <property name="cacheable" value="false"/>
     </bean>
     
@@ -52,4 +55,10 @@
         <property name="characterEncoding" value="UTF-8"/>
     </bean>
     
+    <bean class="org.springframework.context.support.ReloadableResourceBundleMessageSource" id="messageSource">
+        <property name="basenames" value="WEB-INF/i18n/messages"/>
+        <property name="defaultEncoding" value="UTF-8"/>
+        <property name="fallbackToSystemLocale" value="true" />       
+    </bean>
+    
 </beans>
\ No newline at end of file