Merge branch 'dev_hotfix' into test

# Conflicts:
#	web/src/main/webapp/WEB-INF/web.xml

@@ -13,6 +13,14 @@
         <param-value>classpath*:META-INF/spring/spring-mybatis-datasource.xml,classpath*:META-INF/spring/spring*.xml</param-value>
         <param-value>classpath*:META-INF/spring/spring-mybatis-datasource.xml,classpath*:META-INF/spring/spring*.xml</param-value>
     </context-param>
     </context-param>
 
 
+	<servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>/common/ok.jsp</url-pattern>
+        <url-pattern>/cocacola/html/*</url-pattern>
+        <url-pattern>/cocacola/images/*</url-pattern>
+        <url-pattern>/js/*</url-pattern>
+    </servlet-mapping>
+
     <servlet>
     <servlet>
         <servlet-name>dispatcher</servlet-name>
         <servlet-name>dispatcher</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
@@ -27,11 +35,6 @@
         <url-pattern>/*</url-pattern>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
     </servlet-mapping>
 
 
-    <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/common/ok.jsp</url-pattern>
-    </servlet-mapping>
-
     <listener>
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
     </listener>