Index: lams_central/web/WEB-INF/tags/LearnerFlashEnabled.tag
===================================================================
diff -u -r4f68a533e24967e0185132c5e361a8a054f43941 -r52e786cd7815af22fbae4206466a9947b051f9ae
--- lams_central/web/WEB-INF/tags/LearnerFlashEnabled.tag	(.../LearnerFlashEnabled.tag)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
+++ lams_central/web/WEB-INF/tags/LearnerFlashEnabled.tag	(.../LearnerFlashEnabled.tag)	(revision 52e786cd7815af22fbae4206466a9947b051f9ae)
@@ -36,9 +36,17 @@
 
 <c:set var="serverEnableFlash"><lams:Configuration key="EnableFlash"/></c:set>
 <c:set var="userEnableFlash"><lams:user property="enableFlash"/></c:set>
+<c:set var="forceMobileDevToUseFlashless"><lams:Configuration key="ForceMobileDevToUseFlashless"/></c:set>
 
+<%
+	//Checks if it's a mobile device and sets result to isMobileDevice attribute
+	String userAgent = request.getHeader("User-Agent").toLowerCase();
+	boolean isMobileDevice = userAgent.matches(".*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*") || userAgent.substring(0,4).matches("1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-") || userAgent.contains("chrome");
+	jspContext.setAttribute("isMobileDevice", isMobileDevice);
+%>
+
 <c:choose>
-	<c:when test="${serverEnableFlash and userEnableFlash}">true</c:when>
+	<c:when test="${serverEnableFlash && userEnableFlash && (!forceMobileDevToUseFlashless || !isMobileDevice)}">true</c:when>
 	<c:otherwise>false</c:otherwise>
 </c:choose>
 	
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rab19db088359a46353cc92e806c40ff5cff818b9 -r52e786cd7815af22fbae4206466a9947b051f9ae
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision ab19db088359a46353cc92e806c40ff5cff818b9)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 52e786cd7815af22fbae4206466a9947b051f9ae)
@@ -44,7 +44,7 @@
 	<param-value>context.central</param-value>
 </context-param>
 
-  <filter>
+<filter>
 	<filter-name>SystemSessionFilter</filter-name>
 	<filter-class>
 		org.lamsfoundation.lams.web.session.SystemSessionFilter
@@ -85,11 +85,11 @@
 	-->
 	<init-param>
 		<param-name>ignorePaths</param-name>
-		<param-value>/login,/server,/echo</param-value>
+		<param-value>/servlet/authoring/storeLearningDesignDetails</param-value>
 	</init-param>
 </filter>
 
-  <filter-mapping>
+<filter-mapping>
 	<filter-name>SystemSessionFilter</filter-name>
 	<url-pattern>*.do</url-pattern>
 </filter-mapping>
@@ -116,7 +116,7 @@
 
 <filter-mapping>
 	<filter-name>SystemSessionFilter</filter-name>
-	<url-pattern>/fckeditor/*</url-pattern>
+	<url-pattern>/ckeditor/*</url-pattern>
 </filter-mapping>
 
 <filter-mapping>
@@ -156,7 +156,7 @@
 
 <filter-mapping>
 	<filter-name>hibernateFilter</filter-name>
-	<url-pattern>/fckeditor/*</url-pattern>
+	<url-pattern>/ckeditor/*</url-pattern>
 </filter-mapping>
 
 <filter-mapping>
@@ -196,12 +196,12 @@
 
 <filter-mapping>
 	<filter-name>LocaleFilter</filter-name>
-	<url-pattern>/fckeditor/*</url-pattern>
+	<url-pattern>/ckeditor/*</url-pattern>
 </filter-mapping>
 
 <filter-mapping>
 	<filter-name>OpenIdFilter</filter-name>
-<url-pattern>/*</url-pattern>
+<url-pattern>/OpenIDServlet</url-pattern>
 </filter-mapping>
 
 <filter-mapping>
@@ -234,18 +234,28 @@
 </listener>
 
    <servlet>
+      <servlet-name>insertLearningDesign</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.InsertLDServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>GetRecordingServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.GetRecordingServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>forgotPasswordServlet</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.ForgotPasswordServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>WhiteboardToSwfServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToSwfServlet</servlet-class>
+      <servlet-name>flashCrashDump</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>dumpWDDX</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
+      <servlet-name>storeLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -293,42 +303,38 @@
 
    </servlet>
    <servlet>
+      <servlet-name>copyMultipleToolContent</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.CopyMultipleToolContentServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>updateCollapsedGroup</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.UpdateCollapsedGroupServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>Connector</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.LAMSConnectorServlet</servlet-class>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
 
-      <init-param>
-         <param-name>baseDir</param-name>
-         <param-value>secure</param-value>
-      </init-param>
-      <init-param>
-         <param-name>debug</param-name>
-         <param-value>true</param-value>
-      </init-param>
+   </servlet>
+   <servlet>
+      <servlet-name>lamsStartupServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.LamsStartupServlet</servlet-class>
 
       <load-on-startup>1</load-on-startup>
 
    </servlet>
    <servlet>
-      <servlet-name>BogoPogoServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToJpgServlet</servlet-class>
+      <servlet-name>WhiteboardToSwfServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToSwfServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>flashCrashDump</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
+      <servlet-name>storeTheme</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>editLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.EditOnFlyServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>competenceServlet</servlet-name>
       <servlet-class>org.lamsfoundation.lams.authoring.web.CompetenceServlet</servlet-class>
 
@@ -339,48 +345,42 @@
 
    </servlet>
    <servlet>
-      <servlet-name>storeLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
+      <servlet-name>Connector</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.LAMSConnectorServlet</servlet-class>
 
+      <init-param>
+         <param-name>baseDir</param-name>
+         <param-value>secure</param-value>
+      </init-param>
+      <init-param>
+         <param-name>debug</param-name>
+         <param-value>true</param-value>
+      </init-param>
+
+      <load-on-startup>1</load-on-startup>
+
    </servlet>
    <servlet>
       <servlet-name>saveLessonOrder</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.LessonOrderServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeTheme</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
+      <servlet-name>editLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.EditOnFlyServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>insertLearningDesign</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.InsertLDServlet</servlet-class>
+      <servlet-name>dumpWDDX</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToJpgServlet</servlet-class>
 
    </servlet>
-   <servlet>
-      <servlet-name>lamsStartupServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.LamsStartupServlet</servlet-class>
 
-      <load-on-startup>1</load-on-startup>
-
-   </servlet>
-   <servlet>
-      <servlet-name>GetRecordingServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.GetRecordingServlet</servlet-class>
-
-   </servlet>
-   <servlet>
-      <servlet-name>copyMultipleToolContent</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.CopyMultipleToolContentServlet</servlet-class>
-
-   </servlet>
-
  <servlet>
 	<servlet-name>action</servlet-name>
 	<servlet-class>
@@ -448,6 +448,13 @@
 </servlet>
 
 <servlet>
+	<servlet-name>LearningDesignSVG</servlet-name>
+	<servlet-class>
+		org.lamsfoundation.lams.webservice.LearningDesignSVGServlet
+	</servlet-class>
+</servlet>
+
+<servlet>
 	<servlet-name>LessonManager</servlet-name>
 	<servlet-class>
 		org.lamsfoundation.lams.webservice.xml.LessonManagerServlet
@@ -502,6 +509,11 @@
 </servlet-mapping>
 
 <servlet-mapping>
+	<servlet-name>LearningDesignSVG</servlet-name>
+	<url-pattern>/services/LearningDesignSVG/*</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
 	<servlet-name>LessonManager</servlet-name>
 	<url-pattern>/services/xml/LessonManager/*</url-pattern>
 </servlet-mapping>
@@ -517,40 +529,52 @@
 </servlet-mapping>
 
    <servlet-mapping>
+      <servlet-name>insertLearningDesign</servlet-name>
+      <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>GetRecordingServlet</servlet-name>
+      <url-pattern>/GetRecording</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>forgotPasswordServlet</servlet-name>
       <url-pattern>/ForgotPasswordRequest</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>WhiteboardToSwfServlet</servlet-name>
-      <url-pattern>/WhiteboardToSwf</url-pattern>
+      <servlet-name>flashCrashDump</servlet-name>
+      <url-pattern>/servlet/flashCrashDump</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>dumpWDDX</servlet-name>
-      <url-pattern>/servlet/dumpWDDX</url-pattern>
+      <servlet-name>storeLD</servlet-name>
+      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>SimpleUploader</servlet-name>
-      <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
+      <url-pattern>/ckeditor/filemanager/upload/simpleuploader</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>copyMultipleToolContent</servlet-name>
+      <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>updateCollapsedGroup</servlet-name>
       <url-pattern>/servlet/updateCollapsedGroup</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>Connector</servlet-name>
-      <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>BogoPogoServlet</servlet-name>
-      <url-pattern>/BogoPogo</url-pattern>
+      <servlet-name>lamsStartupServlet</servlet-name>
+      <url-pattern>/lamsstartupservlet</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>flashCrashDump</servlet-name>
-      <url-pattern>/servlet/flashCrashDump</url-pattern>
+      <servlet-name>WhiteboardToSwfServlet</servlet-name>
+      <url-pattern>/WhiteboardToSwf</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>editLD</servlet-name>
-      <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
+      <servlet-name>storeTheme</servlet-name>
+      <url-pattern>/themes/servlet/storeTheme</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>competenceServlet</servlet-name>
@@ -561,37 +585,25 @@
       <url-pattern>/services/xml/LessonJoin/*</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeLD</servlet-name>
-      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
+      <servlet-name>Connector</servlet-name>
+      <url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>saveLessonOrder</servlet-name>
       <url-pattern>/servlet/saveLessonOrder</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeTheme</servlet-name>
-      <url-pattern>/themes/servlet/storeTheme</url-pattern>
+      <servlet-name>editLD</servlet-name>
+      <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>insertLearningDesign</servlet-name>
-      <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
+      <servlet-name>dumpWDDX</servlet-name>
+      <url-pattern>/servlet/dumpWDDX</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <url-pattern>/BogoPogo</url-pattern>
    </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>lamsStartupServlet</servlet-name>
-      <url-pattern>/lamsstartupservlet</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>GetRecordingServlet</servlet-name>
-      <url-pattern>/GetRecording</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>copyMultipleToolContent</servlet-name>
-      <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
-   </servlet-mapping>
 
    <session-config>
       <session-timeout>120</session-timeout>
@@ -679,10 +691,6 @@
 		<!--  ======================================================== -->	
 		<!--   Customized Tag Library -->
 		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-		</taglib>
 		 <taglib>
 		   <taglib-uri>tags-lams</taglib-uri>
 		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
@@ -761,6 +769,15 @@
     		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Prohibited Content</web-resource-name>
+		    <url-pattern>/index.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
 	<!--  some combine role security setting -->
     <security-constraint>
Index: lams_central/web/learner.jsp
===================================================================
diff -u -ra91a7f523070940c179e47c19a3562a20579d0ab -r52e786cd7815af22fbae4206466a9947b051f9ae
--- lams_central/web/learner.jsp	(.../learner.jsp)	(revision a91a7f523070940c179e47c19a3562a20579d0ab)
+++ lams_central/web/learner.jsp	(.../learner.jsp)	(revision 52e786cd7815af22fbae4206466a9947b051f9ae)
@@ -9,11 +9,10 @@
 <lams:html>
 <lams:head>
 
-<c:set var="forceMobileDevToUseFlashless"><lams:Configuration key="ForceMobileDevToUseFlashless"/></c:set>
 <c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
 	
 <c:choose>
-	<c:when test="${enableFlash && (!forceMobileDevToUseFlashless || !isMobileDevice)}">
+	<c:when test="${enableFlash}">
 		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImEnabled}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&createDateTime=<c:out value="${createDateTime}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if>">
 	</c:when>
 	<c:otherwise>
Index: lams_learning/web/WEB-INF/tags/LearnerFlashEnabled.tag
===================================================================
diff -u -r4f68a533e24967e0185132c5e361a8a054f43941 -r52e786cd7815af22fbae4206466a9947b051f9ae
--- lams_learning/web/WEB-INF/tags/LearnerFlashEnabled.tag	(.../LearnerFlashEnabled.tag)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
+++ lams_learning/web/WEB-INF/tags/LearnerFlashEnabled.tag	(.../LearnerFlashEnabled.tag)	(revision 52e786cd7815af22fbae4206466a9947b051f9ae)
@@ -36,9 +36,17 @@
 
 <c:set var="serverEnableFlash"><lams:Configuration key="EnableFlash"/></c:set>
 <c:set var="userEnableFlash"><lams:user property="enableFlash"/></c:set>
+<c:set var="forceMobileDevToUseFlashless"><lams:Configuration key="ForceMobileDevToUseFlashless"/></c:set>
 
+<%
+	//Checks if it's a mobile device and sets result to isMobileDevice attribute
+	String userAgent = request.getHeader("User-Agent").toLowerCase();
+	boolean isMobileDevice = userAgent.matches(".*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*") || userAgent.substring(0,4).matches("1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-") || userAgent.contains("chrome");
+	jspContext.setAttribute("isMobileDevice", isMobileDevice);
+%>
+
 <c:choose>
-	<c:when test="${serverEnableFlash and userEnableFlash}">true</c:when>
+	<c:when test="${serverEnableFlash && userEnableFlash && (!forceMobileDevToUseFlashless || !isMobileDevice)}">true</c:when>
 	<c:otherwise>false</c:otherwise>
 </c:choose>