diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aa5c086b8a..a2e7071bbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
           check_name: Java JUnit Test Results
           files: ./build/test-results/**/*.xml
       - name: Publish JUnit Test Results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: junit-java-test-results
           path: ./build/test-reports/
@@ -58,7 +58,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 22.9.0
       - name: Cache node modules
         id: nodeCache
         uses: actions/cache@v3
@@ -81,7 +81,7 @@ jobs:
           check_name: Java Script Mocha Unit Test Results
           files: ./scadalts-ui/test-results.xml
       - name: Publish Mocha Test Results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: mocha-js-test-results
           path: ./scadalts-ui/test-results.xml
@@ -166,7 +166,7 @@ jobs:
           key: ${{ runner.os }}-war-${{ github.run_id }}
           path: ./build/libs/Scada-LTS.war
       - name: Deploy WAR artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Scada-LTS
           path: ./build/libs/Scada-LTS.war
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 5f5a2911ff..31818ad677 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 22.9.0
       - name: Cache node modules
         id: nodeCache
         uses: actions/cache@v3
@@ -151,7 +151,7 @@ jobs:
           key: ${{ runner.os }}-war-${{ github.run_id }}
           path: ./build/libs/Scada-LTS.war
       - name: Deploy WAR artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Scada-LTS
           path: ./build/libs/Scada-LTS.war
diff --git a/.gitignore b/.gitignore
index ec055c59ed..eaec9b3604 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,7 @@ catalina-jrebel.bat
 # Ignore Gradle project-specific cache directory
 .gradle
 gradle/
+!gradle/gradle-wrapper.properties
 # Ignore Gradle build output directory
 WebContent/resources/node_modules/
 build
diff --git a/WebContent/WEB-INF/dwr.xml b/WebContent/WEB-INF/dwr.xml
index c377cee1cb..75f2e367e1 100644
--- a/WebContent/WEB-INF/dwr.xml
+++ b/WebContent/WEB-INF/dwr.xml
@@ -22,6 +22,8 @@
   <init>
     <converter id="localizableMessage" class="com.serotonin.web.dwr.LocalizableMessageConverter"/>
     <converter id="protocolVersionConverter" class="com.serotonin.mango.web.dwr.ProtocolVersionConverter"/>
+    <converter id="xssDataPointVoConverter" class="com.serotonin.mango.web.dwr.XssDataPointVoConverter"/>
+    <converter id="xssDataPointBeanConverter" class="com.serotonin.mango.web.dwr.XssDataPointBeanConverter"/>
   </init>
   
   <allow>
@@ -153,9 +155,12 @@
     <convert converter="bean" match="com.serotonin.mango.vo.publish.pachube.*"/>
     <convert converter="bean" match="com.serotonin.mango.vo.publish.persistent.*"/>
     <convert converter="bean" match="com.serotonin.mango.vo.report.*"/>
-    <convert converter="bean" match="com.serotonin.mango.vo.DataPointVO">
+    <convert converter="xssDataPointVoConverter" match="com.serotonin.mango.vo.DataPointVO">
       <param name="include" value="id,xid,name,extendedName,dataSourceId,enabled,dataTypeMessage,pointLocator"/>
     </convert>
+    <convert converter="xssDataPointBeanConverter" match="com.serotonin.mango.web.dwr.beans.DataPointBean">
+      <param name="include" value="id,xid,name,settable,dataType,dataTypeMessage,chartColour"/>
+    </convert>
     <convert converter="bean" match="com.serotonin.mango.vo.User">
       <param name="include" value="id,username,email,phone,admin,disabled,receiveAlarmEmails,receiveOwnAuditEvents,dataSourcePermissions,dataPointPermissions,userProfile,homeUrl,hideMenu,theme,firstName,lastName,enableFullScreen,hideShortcutDisableFullScreen"/>
     </convert>
diff --git a/WebContent/WEB-INF/ftl/report/reportChart.ftl b/WebContent/WEB-INF/ftl/report/reportChart.ftl
index b11fa20918..12f2a182e3 100644
--- a/WebContent/WEB-INF/ftl/report/reportChart.ftl
+++ b/WebContent/WEB-INF/ftl/report/reportChart.ftl
@@ -87,7 +87,7 @@
       <td>
         <table>
           <tr>
-            <td colspan="2"><h1>${instance.name}</h1></td>
+            <td colspan="2"><h1>${security.escapeHtml(instance.name)}</h1></td>
           </tr>
           <tr>
             <td class="label"><@fmt key="reports.runTimeStart"/></td>
@@ -121,7 +121,7 @@
       
       <td class="stats">
         <table>
-          <tr><td colspan="2" class="pointName">${point.name}</td></tr>
+          <tr><td colspan="2" class="pointName">${security.escapeHtml(point.name)}</td></tr>
           <tr>
             <td class="label"><@fmt key="reports.dataType"/></td>
             <td>${point.dataTypeDescription}</td>
diff --git a/WebContent/WEB-INF/jsp/_reports.jsp b/WebContent/WEB-INF/jsp/_reports.jsp
index 3cd2747785..5aa94781fb 100644
--- a/WebContent/WEB-INF/jsp/_reports.jsp
+++ b/WebContent/WEB-INF/jsp/_reports.jsp
@@ -34,8 +34,8 @@
             allPointsArray = response.data.points;
             
             emailRecipients = new mango.erecip.EmailRecipients("recipients",
-                    "<fmt:message key="reports.recipTestEmailMessage"/>", response.data.mailingLists, response.data.users);
-            emailRecipients.write("emailRecipBody", "emailRecipients", null, "<fmt:message key="reports.emailRecipients"/>");
+                    "<spring:message code="reports.recipTestEmailMessage"/>", response.data.mailingLists, response.data.users);
+            emailRecipients.write("emailRecipBody", "emailRecipients", null, "<spring:message code="reports.emailRecipients"/>");
             
             updateReportInstancesList(response.data.instances);
             
@@ -225,18 +225,18 @@
                                 ri.state == <c:out value="<%= ReportInstance.STATE_STARTED %>"/>)
                             return "";
                             
-                        var result = "<img src='images/bullet_down.png' class='ptr' title='<fmt:message key="reports.export"/>' "+
+                        var result = "<img src='images/bullet_down.png' class='ptr' title='<spring:message code="reports.export"/>' "+
                                 "onclick='exportData(\""+ encodeQuotes(ri.name) +"\", "+ ri.id +")'/>";
                         
                         if (ri.includeEvents != <c:out value="<%= ReportVO.EVENTS_NONE %>"/>)
-                            result += "<img src='images/flag_white.png' class='ptr' title='<fmt:message key="reports.eventExport"/>' "+
+                            result += "<img src='images/flag_white.png' class='ptr' title='<spring:message code="reports.eventExport"/>' "+
                                     "onclick='exportEventData(\""+ encodeQuotes(ri.name) +"\", "+ ri.id +")'/>";
                         
                         if (ri.includeUserComments)
-                            result += "<img src='images/comment.png' class='ptr' title='<fmt:message key="reports.userCommentExport"/>' "+
+                            result += "<img src='images/comment.png' class='ptr' title='<spring:message code="reports.userCommentExport"/>' "+
                                     "onclick='exportUserComments(\""+ encodeQuotes(ri.name) +"\", "+ ri.id +")'/>";
                         
-                        result += "<img src='images/icon_chart.png' class='ptr' title='<fmt:message key="reports.charts"/>' "+
+                        result += "<img src='images/icon_chart.png' class='ptr' title='<spring:message code="reports.charts"/>' "+
                                 "onclick='viewChart("+ ri.id +")'/>"+
                                 "<img id='ri"+ ri.id +"DeleteImg' src='images/bullet_delete.png' class='ptr' "+
                                 "onclick='deleteReportInstance("+ ri.id +")'/> ";
@@ -393,12 +393,12 @@
                     selectedReport.id = response.data.reportId;
                     appendReport(selectedReport.id);
                     startImageFader("r"+ selectedReport.id +"Img");
-                    showMessage("userMessage", "<fmt:message key="reports.reportAdded"/>");
+                    showMessage("userMessage", "<spring:message code="reports.reportAdded"/>");
                     show("deleteImg");
                     show("copyImg");
                 }
                 else
-                    showMessage("userMessage", "<fmt:message key="reports.reportSaved"/>");
+                    showMessage("userMessage", "<spring:message code="reports.reportSaved"/>");
                 updateReport(selectedReport.id, $get("name"));
             }
         });
@@ -457,7 +457,7 @@
             if (response.hasMessages)
                 showMessages(response.messages);
             else {
-                showMessage("userMessage", "<fmt:message key="reports.reportQueued"/>");
+                showMessage("userMessage", "<spring:message code="reports.reportQueued"/>");
                 refreshReportInstanceList();
             }
         });
@@ -470,7 +470,7 @@
       <table width="100%">
         <tr>
           <td>
-            <span class="smallTitle"><fmt:message key="reports.reportQueue"/></span>
+            <span class="smallTitle"><spring:message code="reports.reportQueue"/></span>
             <tag:help id="reportInstances"/>
           </td>
           <td align="right">
@@ -482,17 +482,17 @@
       
       <table cellspacing="1">
         <tr class="rowHeader">
-          <td><fmt:message key="reports.reportName"/></td>
-          <td><fmt:message key="reports.runTimeStart"/></td>
-          <td><fmt:message key="reports.runDuration"/></td>
-          <td><fmt:message key="common.dateRangeFrom"/></td>
-          <td><fmt:message key="common.dateRangeTo"/></td>
-          <td><fmt:message key="reports.reportRecords"/></td>
-          <td><fmt:message key="reports.doNotPurge"/></td>
+          <td><spring:message code="reports.reportName"/></td>
+          <td><spring:message code="reports.runTimeStart"/></td>
+          <td><spring:message code="reports.runDuration"/></td>
+          <td><spring:message code="common.dateRangeFrom"/></td>
+          <td><spring:message code="common.dateRangeTo"/></td>
+          <td><spring:message code="reports.reportRecords"/></td>
+          <td><spring:message code="reports.doNotPurge"/></td>
           <td></td>
         </tr>
         <tr id="hourglass" class="row"><td colspan="8" align="center"><tag:img png="hourglass" title="reports.loading"/></td></tr>
-        <tr id="noReportInstances" class="row" style="display:none;"><td colspan="8"><fmt:message key="reports.noInstances"/></td></tr>
+        <tr id="noReportInstances" class="row" style="display:none;"><td colspan="8"><spring:message code="reports.noInstances"/></td></tr>
         <tbody id="reportInstancesList"></tbody>
       </table>
     </div>
@@ -505,7 +505,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="reports.templates"/></span>
+                <span class="smallTitle"><spring:message code="reports.templates"/></span>
                 <tag:help id="reportTemplates"/>
               </td>
               <td align="right"><tag:img png="report_add" title="reports.newReport"
@@ -528,7 +528,7 @@
             <tr>
               <td>
                 <span class="smallTitle"><tag:img id="reportImg" png="report" title="reports.report"/>
-                <fmt:message key="reports.criteria"/></span>
+                <spring:message code="reports.criteria"/></span>
               </td>
               <td align="right">
                 <tag:img id="deleteImg" png="delete" title="common.delete" onclick="deleteReport();"/>
@@ -542,7 +542,7 @@
           
           <table>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.reportName"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.reportName"/></td>
               <td class="formField">
                 <input type="text" id="name" class="formLong"/><br/>
                 <span class="formError" id="nameError"></span>
@@ -550,20 +550,20 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.points"/></td>
+              <td class="formLabelRequired"><spring:message code="common.points"/></td>
               <td class="formField">
                 <select id="allPointsList"></select>
                 <tag:img png="add" onclick="addPointToReport();" title="common.add"/>
                 
                 <table cellspacing="1">
                   <tbody id="reportPointsTableEmpty" style="display:none;">
-                    <tr><th colspan="4"><fmt:message key="reports.noPoints"/></th></tr>
+                    <tr><th colspan="4"><spring:message code="reports.noPoints"/></th></tr>
                   </tbody>
                   <tbody id="reportPointsTableHeaders" style="display:none;">
                     <tr class="smRowHeader">
-                      <td><fmt:message key="reports.pointName"/></td>
-                      <td><fmt:message key="reports.dataType"/></td>
-                      <td><fmt:message key="reports.colour"/></td>
+                      <td><spring:message code="reports.pointName"/></td>
+                      <td><spring:message code="reports.dataType"/></td>
+                      <td><spring:message code="reports.colour"/></td>
                       <td></td>
                     </tr>
                   </tbody>
@@ -574,29 +574,29 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.events"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.events"/></td>
               <td class="formField">
                 <select id="includeEvents">
-                  <option value="<c:out value="<%= ReportVO.EVENTS_NONE %>"/>"><fmt:message key="reports.events.none"/></option>
-                  <option value="<c:out value="<%= ReportVO.EVENTS_ALARMS %>"/>"><fmt:message key="reports.events.alarms"/></option>
-                  <option value="<c:out value="<%= ReportVO.EVENTS_ALL %>"/>"><fmt:message key="reports.events.all"/></option>
+                  <option value="<c:out value="<%= ReportVO.EVENTS_NONE %>"/>"><spring:message code="reports.events.none"/></option>
+                  <option value="<c:out value="<%= ReportVO.EVENTS_ALARMS %>"/>"><spring:message code="reports.events.alarms"/></option>
+                  <option value="<c:out value="<%= ReportVO.EVENTS_ALL %>"/>"><spring:message code="reports.events.all"/></option>
                 </select>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.comments"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.comments"/></td>
               <td class="formField"><input type="checkbox" id="includeUserComments"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.dateRange"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.dateRange"/></td>
               <td class="formField">
                 <table>
                   <tr><td>
                     <input type="radio" name="dateRangeType" value="<c:out value="<%= ReportVO.DATE_RANGE_TYPE_RELATIVE %>"/>" id="drrel" 
                             checked="checked" onchange="updateDateRangeFields()"/><label 
-                            for="drrel"><fmt:message key="reports.relative"/></label>
+                            for="drrel"><spring:message code="reports.relative"/></label>
                   </td></tr>
                   <tr>
                     <td style="padding-left:40px;">
@@ -604,7 +604,7 @@
                         <tr>
                           <td valign="top"><input type="radio" name="relativeType" onchange="updateDateRangeFields()"
                                   id="relprev" value="<c:out value="<%= ReportVO.RELATIVE_DATE_TYPE_PREVIOUS %>"/>" 
-                                  checked="checked"/><label for="relprev"><fmt:message key="reports.previous"/></label></td>
+                                  checked="checked"/><label for="relprev"><spring:message code="reports.previous"/></label></td>
                           <td valign="top">
                             <input type="text" id="prevPeriodCount" class="formVeryShort"/>
                             <select id="prevPeriodType">
@@ -616,7 +616,7 @@
                         <tr>
                           <td valign="top"><input type="radio" name="relativeType" onchange="updateDateRangeFields()"
                                   id="relpast" value="<c:out value="<%= ReportVO.RELATIVE_DATE_TYPE_PAST %>"/>"/><label 
-                                  for="relpast"><fmt:message key="reports.past"/></label></td>
+                                  for="relpast"><spring:message code="reports.past"/></label></td>
                           <td valign="top">
                             <input type="text" id="pastPeriodCount" class="formVeryShort"/>
                             <select id="pastPeriodType">
@@ -631,39 +631,39 @@
                   
                   <tr><td>
                     <input type="radio" name="dateRangeType" value="<c:out value="<%= ReportVO.DATE_RANGE_TYPE_SPECIFIC %>"/>" id="drspec" 
-                            onchange="updateDateRangeFields()"/><label for="drspec"><fmt:message key="reports.specificDates"/></label>
+                            onchange="updateDateRangeFields()"/><label for="drspec"><spring:message code="reports.specificDates"/></label>
                   </td></tr>
                   <tr>
                     <td style="padding-left:40px;">
                       <table>
                         <tr>
                           <td></td>
-                          <td align="center"><fmt:message key="common.tp.year"/></td>
-                          <td align="center"><fmt:message key="common.tp.month"/></td>
-                          <td align="center"><fmt:message key="common.tp.day"/></td>
-                          <td align="center"><fmt:message key="common.tp.hour"/></td>
-                          <td align="center"><fmt:message key="common.tp.minute"/></td>
+                          <td align="center"><spring:message code="common.tp.year"/></td>
+                          <td align="center"><spring:message code="common.tp.month"/></td>
+                          <td align="center"><spring:message code="common.tp.day"/></td>
+                          <td align="center"><spring:message code="common.tp.hour"/></td>
+                          <td align="center"><spring:message code="common.tp.minute"/></td>
                           <td></td>
                         </tr>
                         <tr>
-                          <td><fmt:message key="common.dateRangeFrom"/></td>
+                          <td><spring:message code="common.dateRangeFrom"/></td>
                           <td><input type="text" id="fromYear" class="formVeryShort"/></td>
                           <td><select id="fromMonth"><tag:monthOptions/></select></td>
                           <td><select id="fromDay"><tag:dayOptions/></select></td>
                           <td><select id="fromHour"><tag:hourOptions/></select></td>
                           <td><select id="fromMinute"><tag:minuteOptions/></select></td>
                           <td><input type="checkbox" name="fromNone" id="fromNone"
-                                  onclick="updateDateRangeFields()"/><label for="fromNone"><fmt:message key="common.inception"/></label></td>
+                                  onclick="updateDateRangeFields()"/><label for="fromNone"><spring:message code="common.inception"/></label></td>
                         </tr>
                         <tr>
-                          <td><fmt:message key="common.dateRangeTo"/></td>
+                          <td><spring:message code="common.dateRangeTo"/></td>
                           <td><input type="text" id="toYear" class="formVeryShort"/></td>
                           <td><select id="toMonth"><tag:monthOptions/></select></td>
                           <td><select id="toDay"><tag:dayOptions/></select></td>
                           <td><select id="toHour"><tag:hourOptions/></select></td>
                           <td><select id="toMinute"><tag:minuteOptions/></select></td>
                           <td><input type="checkbox" name="toNone" id="toNone" 
-                                  onclick="updateDateRangeFields()"/><label for="toNone"><fmt:message key="common.latest"/></label></td>
+                                  onclick="updateDateRangeFields()"/><label for="toNone"><spring:message code="common.latest"/></label></td>
                         </tr>
                       </table>
                     </td>
@@ -675,7 +675,7 @@
             <tr><td colspan="3" class="horzSeparator"></td></tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.schedule"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.schedule"/></td>
               <td class="formField">
                 <input type="checkbox" id="schedule" onclick="updateScheduleFields();"/>
               </td>
@@ -683,21 +683,21 @@
             
             <tbody id="scheduleDetails">
               <tr>
-                <td class="formLabelRequired"><fmt:message key="reports.runEvery"/></td>
+                <td class="formLabelRequired"><spring:message code="reports.runEvery"/></td>
                 <td class="formField">
                   <table cellpadding="0" cellspacing="0">
                     <tr><td>
                       <select id="schedulePeriod" onchange="updateSchedulePeriodFields()">
                         <tag:timePeriodOptions h="true" d="true" w="true" mon="true" y="true" singular="true"/>
-                        <option value="<c:out value="<%= ReportVO.SCHEDULE_CRON %>"/>"><fmt:message key="reports.cron"/></option>
+                        <option value="<c:out value="<%= ReportVO.SCHEDULE_CRON %>"/>"><spring:message code="reports.cron"/></option>
                       </select>
                     </td></tr>
                     <tr><td style="padding-left:40px;">
-                      <fmt:message key="reports.runDelay"/>: <input type="text" id="runDelayMinutes" class="formVeryShort"/>
+                      <spring:message code="reports.runDelay"/>: <input type="text" id="runDelayMinutes" class="formVeryShort"/>
                       <div id="runDelayMinutesError" class="formError"></div>
                     </td></tr>
                     <tr><td style="padding-left:40px;">
-                      <fmt:message key="common.cronPattern"/>: <input type="text" id="scheduleCron"/>
+                      <spring:message code="common.cronPattern"/>: <input type="text" id="scheduleCron"/>
                       <tag:help id="cronPatterns"/><br/>
                       <span id="scheduleCronError" class="formError"></span>
                     </td></tr>
@@ -709,13 +709,13 @@
             <tr><td colspan="3" class="horzSeparator"></td></tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.emailReport"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.emailReport"/></td>
               <td class="formField"><input type="checkbox" id="email" onclick="updateEmailFields();"/></td>
             </tr>
               
             <tbody id="emailDetails">
               <tr>
-                <td class="formLabelRequired"><fmt:message key="reports.includeTabular"/></td>
+                <td class="formLabelRequired"><spring:message code="reports.includeTabular"/></td>
                 <td class="formField"><input type="checkbox" id="includeData"/></td>
               </tr>
             </tbody>
diff --git a/WebContent/WEB-INF/jsp/_watchList.jsp b/WebContent/WEB-INF/jsp/_watchList.jsp
index 2377f3e9db..2d98bbbaeb 100644
--- a/WebContent/WEB-INF/jsp/_watchList.jsp
+++ b/WebContent/WEB-INF/jsp/_watchList.jsp
@@ -127,7 +127,7 @@
       function addPoint(point, parent) {
           var pointNode = dojo.widget.createWidget("TreeNode", {
                   title: "<img src='images/icon_comp.png'/> <span id='ph"+ point.key +"Name'>"+ point.value +"</span> "+
-                          "<img src='images/bullet_go.png' id='ph"+ point.key +"Image' title='<fmt:message key="watchlist.addToWatchlist"/>'/>",
+                          "<img src='images/bullet_go.png' id='ph"+ point.key +"Image' title='<spring:message code="watchlist.addToWatchlist"/>'/>",
                   object: point
           });
           parent.addChild(pointNode);
@@ -432,7 +432,7 @@
       <div dojoType="SplitContainer" orientation="horizontal" sizerWidth="3" activeSizing="true" class="borderDiv"
               widgetId="splitContainer" style="width: 100%; height: 500px;">
         <div dojoType="ContentPane" sizeMin="20" sizeShare="20" style="overflow:auto;padding:2px;">
-          <span class="smallTitle"><fmt:message key="watchlist.points"/></span> <tag:help id="watchListPoints"/> 
+          <span class="smallTitle"><spring:message code="watchlist.points"/></span> <tag:help id="watchListPoints"/>
           <tag:img id="addAllImg" png="icon_ds_go"
                       onclick="addAllPoints()" title="common.addAll" style="float:right;"/>
           <br/>
@@ -442,7 +442,7 @@
         <div dojoType="ContentPane" sizeMin="50" sizeShare="50" style="overflow:auto; padding:2px 10px 2px 2px;">
           <table cellpadding="0" cellspacing="0" width="100%">
             <tr>
-              <td class="smallTitle"><fmt:message key="watchlist.watchlist"/> <tag:help id="watchList"/></td>
+              <td class="smallTitle"><spring:message code="watchlist.watchlist"/> <tag:help id="watchList"/></td>
               <td align="right">
                 <sst:select id="watchListSelect" value="${selectedWatchList}" onchange="watchListChanged()"
                         onmouseover="closeLayers();">
@@ -455,10 +455,10 @@
                   <tag:img id="wlEditImg" png="pencil" title="watchlist.editListName"/>
                   <div id="wlEdit" style="visibility:hidden;left:0px;top:15px;" class="labelDiv"
                           onmouseout="hideLayer(this)">
-                    <fmt:message key="watchlist.newListName"/><br/>
+                    <spring:message code="watchlist.newListName"/><br/>
                     <input type="text" id="newWatchListName"
                             onkeypress="if (event.keyCode==13) $('saveWatchListNameLink').onclick();"/>
-                    <a class="ptr" id="saveWatchListNameLink" onclick="saveWatchListName()"><fmt:message key="common.save"/></a>
+                    <a class="ptr" id="saveWatchListNameLink" onclick="saveWatchListName()"><spring:message code="common.save"/></a>
                   </div>
                 </div>
                 
@@ -519,7 +519,7 @@
             </table>
             <table id="watchListTable" width="100%"></table>
             <div id="emptyListMessage" style="color:#888888;padding:10px;text-align:center;">
-              <fmt:message key="watchlist.emptyList"/>
+              <spring:message code="watchlist.emptyList"/>
             </div>
           </div>
         </div>
@@ -530,7 +530,7 @@
       <div class="borderDiv" style="width: 100%;">
         <table width="100%">
           <tr>
-            <td class="smallTitle"><fmt:message key="watchlist.chart"/> <tag:help id="watchListCharts"/></td>
+            <td class="smallTitle"><spring:message code="watchlist.chart"/> <tag:help id="watchListCharts"/></td>
             <td align="right"><tag:dateRange/></td>
             <td><tag:img id="imageChartImg" png="control_play_blue" title="watchlist.imageChartButton"
                     onclick="getImageChart()"/></td>
diff --git a/WebContent/WEB-INF/jsp/app.jsp b/WebContent/WEB-INF/jsp/app.jsp
index 1e332420c5..66742f5905 100644
--- a/WebContent/WEB-INF/jsp/app.jsp
+++ b/WebContent/WEB-INF/jsp/app.jsp
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<!DOCTYPE html>
 <html lang=en>
     <head>
         <meta charset=utf-8>
diff --git a/WebContent/WEB-INF/jsp/compoundEvents.jsp b/WebContent/WEB-INF/jsp/compoundEvents.jsp
index a0952b2e93..3e86e391d5 100644
--- a/WebContent/WEB-INF/jsp/compoundEvents.jsp
+++ b/WebContent/WEB-INF/jsp/compoundEvents.jsp
@@ -129,11 +129,11 @@
                     editingCompoundEvent.id = response.data.cedId;
                     appendCompoundEvent(editingCompoundEvent.id);
                     startImageFader($("ced"+ editingCompoundEvent.id +"Img"));
-                    setUserMessage("<fmt:message key="compoundDetectors.cedAdded"/>");
+                    setUserMessage("<spring:message code="compoundDetectors.cedAdded"/>");
                     show($("deleteCompoundEventImg"));
                 }
                 else
-                    setUserMessage("<fmt:message key="compoundDetectors.cedSaved"/>");
+                    setUserMessage("<spring:message code="compoundDetectors.cedSaved"/>");
                 
                 if (response.data.warning)
                     setUserMessage(response.data.warning);
@@ -184,7 +184,7 @@
                     setSelectionRange($("condition"), response.data.from, response.data.to);
             }
             else
-                setUserMessage("<fmt:message key="compoundDetectors.cedValidated"/>");
+                setUserMessage("<spring:message code="compoundDetectors.cedValidated"/>");
         });
     }
     
@@ -200,7 +200,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="compoundDetectors.compoundEventDetectors"/></span>
+                <span class="smallTitle"><spring:message code="compoundDetectors.compoundEventDetectors"/></span>
                 <tag:help id="compoundEventDetectors"/>
               </td>
               <td align="right"><tag:img png="multi_bell_add" title="common.add" id="ced${NEW_ID}Img"
@@ -222,7 +222,7 @@
         <div class="borderDiv">
           <table width="100%">
             <tr>
-              <td><span class="smallTitle"><fmt:message key="compoundDetectors.details"/></span></td>
+              <td><span class="smallTitle"><spring:message code="compoundDetectors.details"/></span></td>
               <td align="right">
                 <tag:img png="save" onclick="saveCompoundEvent();" title="common.save"/>
                 <tag:img id="deleteCompoundEventImg" png="delete" onclick="deleteCompoundEvent();" title="common.delete"/>
@@ -232,17 +232,17 @@
   
           <table>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField"><input type="text" id="xid"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="compoundDetectors.name"/></td>
+              <td class="formLabelRequired"><spring:message code="compoundDetectors.name"/></td>
               <td class="formField"><input type="text" id="name"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+              <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
               <td class="formField">
                 <select id="alarmLevel" onchange="updateAlarmLevelImage(this.value)">
                   <tag:alarmLevelOptions/>
@@ -252,24 +252,24 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.rtn"/></td>
+              <td class="formLabelRequired"><spring:message code="common.rtn"/></td>
               <td class="formField"><input type="checkbox" id="rtn"/></td>
             </tr>
             
             <tr>
               <td class="formLabelRequired">
-                <fmt:message key="compoundDetectors.condition"/>
+                <spring:message code="compoundDetectors.condition"/>
                 <tag:img png="accept" onclick="validate();" title="compoundDetectors.validate"/><br/>
                 <br/>
-                <a href="#" onclick="insertText(' && '); return false;"><fmt:message key="compoundDetectors.and"/></a><br/>
-                <a href="#" onclick="insertText(' || '); return false;"><fmt:message key="compoundDetectors.or"/></a><br/>
-                <a href="#" onclick="insertText('!'); return false;"><fmt:message key="compoundDetectors.not"/></a><br/>
+                <a href="#" onclick="insertText(' && '); return false;"><spring:message code="compoundDetectors.and"/></a><br/>
+                <a href="#" onclick="insertText(' || '); return false;"><spring:message code="compoundDetectors.or"/></a><br/>
+                <a href="#" onclick="insertText('!'); return false;"><spring:message code="compoundDetectors.not"/></a><br/>
               </td>
               <td class="formField"><textarea rows="10" cols="60" id="condition"></textarea></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.disabled"/></td>
+              <td class="formLabelRequired"><spring:message code="common.disabled"/></td>
               <td class="formField"><input type="checkbox" id="disabled"/></td>
             </tr>
           </table>
@@ -286,12 +286,12 @@
     <tr>
       <td valign="top" style="display:none;" id="eventTypes">
         <div class="borderDivPadded">
-          <span class="smallTitle"><fmt:message key="compoundDetectors.eventTypes"/></span>
+          <span class="smallTitle"><spring:message code="compoundDetectors.eventTypes"/></span>
           <div dojoType="TreeBasicController" widgetId="controller"></div>
           <div id="tree">
             <div dojoType="Tree" widgetId="eventTypeTree" listeners="controller" toggle="wipe">
-              <div dojoType="TreeNode" title="<fmt:message key="compoundDetectors.pointEventDetector"/>" widgetId="rootPoint"></div>
-              <div dojoType="TreeNode" title="<fmt:message key="scheduledEvents.ses"/>" widgetId="rootScheduled"></div>
+              <div dojoType="TreeNode" title="<spring:message code="compoundDetectors.pointEventDetector"/>" widgetId="rootPoint"></div>
+              <div dojoType="TreeNode" title="<spring:message code="scheduledEvents.ses"/>" widgetId="rootScheduled"></div>
             </div>
           </div>
         </div>
diff --git a/WebContent/WEB-INF/jsp/dataPointDetails.jsp b/WebContent/WEB-INF/jsp/dataPointDetails.jsp
index 343e09b54d..fd1ad7473d 100644
--- a/WebContent/WEB-INF/jsp/dataPointDetails.jsp
+++ b/WebContent/WEB-INF/jsp/dataPointDetails.jsp
@@ -49,14 +49,14 @@
     function getHistoryTableData() {
         var limit = parseInt($get("historyLimit"));
         if (isNaN(limit))
-            alert("<fmt:message key="pointDetails.recordCountError"/>");
+            alert("<spring:message code="pointDetails.recordCountError"/>");
         else {
             startImageFader($("historyLimitImg"));
             DataPointDetailsDwr.getHistoryTableData(limit, function(response) {
             	var data = response.data.history;
                 dwr.util.removeAllRows("historyTableData");
                 if (!data || data.length == 0)
-                    dwr.util.addRows("historyTableData", ["<fmt:message key="common.noData"/>"], [function(data) { return data; }]);
+                    dwr.util.addRows("historyTableData", ["<spring:message code="common.noData"/>"], [function(data) { return data; }]);
                 else {
                     dwr.util.addRows("historyTableData", data,
                         [
@@ -101,7 +101,7 @@
         var periodType = parseInt($get("statsChartDurationType"));
         
         if (isNaN(period))
-            alert("<fmt:message key="pointDetails.timePeriodError"/>");
+            alert("<spring:message code="pointDetails.timePeriodError"/>");
         else {
             startImageFader($("statsChartImg"));
             DataPointDetailsDwr.getStatsChartData(periodType, period, true, function(response) {
@@ -115,13 +115,13 @@
     function togglePanel(img, panelId) {
         if (!img.minimized) {
             img.src = "images/arrow_out.png";
-            img.title = "<fmt:message key="common.maximize"/>";
+            img.title = "<spring:message code="common.maximize"/>";
             hide(panelId);
             img.minimized = true;
         }
         else {
             img.src = "images/arrow_in.png";
-            img.title = "<fmt:message key="common.minimize"/>";
+            img.title = "<spring:message code="common.minimize"/>";
             show(panelId);
             img.minimized = false;
         }
@@ -131,7 +131,7 @@
     function getFlipbookChart() {
         var limit = parseInt($get("flipbookLimit"));
         if (isNaN(limit))
-            alert("<fmt:message key="pointDetails.imageCountError"/>");
+            alert("<spring:message code="pointDetails.imageCountError"/>");
         else {
             startImageFader($("flipbookChartImg"));
             DataPointDetailsDwr.getFlipbookData(limit, function(response) {
@@ -164,10 +164,10 @@
   <table width="100%">
     <tr>
       <td valign="top" align="right">
-        <fmt:message key="pointDetails.goto"/>:&nbsp;
+        <spring:message code="pointDetails.goto"/>:&nbsp;
         <sst:select id="datPointDetailsPointSelect" value="${point.id}" onchange="window.location='data_point_details.shtm?dpid='+ this.value;">
           <c:forEach items="${userPoints}" var="point">
-            <sst:option value="${point.id}">${point.extendedName}</sst:option>
+            <sst:option value="${point.id}"><c:out value="${point.extendedName}"/></sst:option>
           </c:forEach>
         </sst:select>
 
@@ -192,7 +192,7 @@
             <tr>
               <td class="smallTitle" colspan="2">
                 <tag:img png="icon_comp" title="common.point"/>
-                ${point.name}
+                <c:out value="${point.name}"/>
                 <c:if test="${pointEditor}">
                   <a href="data_point_edit.shtm?dpid=${point.id}"><tag:img png="icon_comp_edit" title="pointDetails.editPoint"/></a>
                   <a href="data_source_edit.shtm?dsid=${point.dataSourceId}&pid=${point.id}"><tag:img png="icon_ds_edit"
@@ -201,22 +201,22 @@
               </td>
             </tr>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.value"/></td>
+              <td class="formLabelRequired"><spring:message code="common.value"/></td>
               <td id="pointValue" class="formField"></td>
             </tr>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.time"/></td>
+              <td class="formLabelRequired"><spring:message code="common.time"/></td>
               <td id="pointValueTime" class="formField"></td>
             </tr>
             <tr id="pointChangeNode" style="display:none">
               <td class="formLabelRequired">
                 <tag:img id="pointChanging" png="icon_edit" title="common.set"/>
-                <fmt:message key="common.set"/>
+                <spring:message code="common.set"/>
               </td>
               <td id="pointChange" class="formField"></td>
             </tr>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField">${point.xid}</td>
             </tr>
             <tr><td colspan="2" id="pointMessages"></td></tr>
@@ -226,10 +226,10 @@
         <div class="borderDiv marB marR">
           <table width="100%">
             <tr>
-              <td class="smallTitle"><fmt:message key="pointDetails.statistics"/></td>
+              <td class="smallTitle"><spring:message code="pointDetails.statistics"/></td>
               <td id="statsAsof"></td>
               <td align="right">
-                <fmt:message key="pointDetails.timePeriod"/>:
+                <spring:message code="pointDetails.timePeriod"/>:
                 <input id="statsChartDuration" style="text-align:right;" type="text" class="formVeryShort"
                         value='${empty periodCount ? "1" : periodCount}'/>
                 <sst:select id="statsChartDurationType" value="${periodType}">
@@ -247,22 +247,22 @@
         <div class="borderDiv marB marR">
           <table width="100%">
             <tr>
-              <td class="smallTitle"><fmt:message key="pointDetails.history"/></td>
+              <td class="smallTitle"><spring:message code="pointDetails.history"/></td>
               <td id="historyTableAsof"></td>
               <td align="right">
-                <fmt:message key="pointDetails.show"/>
+                <spring:message code="pointDetails.show"/>
                 <input id="historyLimit" type="text" style="text-align:right;" value="${historyLimit}"
                         class="formVeryShort"/>
-                <fmt:message key="pointDetails.mostRecentRecords"/>
+                <spring:message code="pointDetails.mostRecentRecords"/>
                 <tag:img id="historyLimitImg" png="control_play_blue" title="pointDetails.getData" onclick="getHistoryTableData()"/>
               </td>
             </tr>
           </table>
           <table cellspacing="1">
             <tr class="rowHeader">
-              <td><fmt:message key="common.value"/></td>
-              <td><fmt:message key="common.time"/></td>
-              <td><fmt:message key="common.annotation"/></td>
+              <td><spring:message code="common.value"/></td>
+              <td><spring:message code="common.time"/></td>
+              <td><spring:message code="common.annotation"/></td>
             </tr>
             <tbody id="historyTableData"></tbody>
           </table>
@@ -273,7 +273,7 @@
         <div class="borderDiv marB">
           <table width="100%">
             <tr>
-              <td class="smallTitle"><fmt:message key="notes.userNotes"/></td>
+              <td class="smallTitle"><spring:message code="notes.userNotes"/></td>
               <td align="right">
                 <tag:img png="comment_add" title="notes.addNote"
                         onclick="openCommentDialog(${applicationScope['constants.UserComment.TYPE_POINT']}, ${point.id})"/>
@@ -292,7 +292,7 @@
           <div class="borderDiv marB">
             <table width="100%">
               <tr>
-                <td class="smallTitle"><fmt:message key="pointDetails.chart"/></td>
+                <td class="smallTitle"><spring:message code="pointDetails.chart"/></td>
                 <td id="imageChartAsof"></td>
                 <td align="right"><tag:dateRange/></td>
                 <td><tag:img id="imageChartImg" png="control_play_blue" title="pointDetails.imageChartButton"
@@ -311,10 +311,10 @@
           <div class="borderDiv marB">
             <table width="100%">
               <tr>
-                <td class="smallTitle"><fmt:message key="pointDetails.flipbook"/></td>
+                <td class="smallTitle"><spring:message code="pointDetails.flipbook"/></td>
                 <td id="flipbookAsof"></td>
                 <td align="right">
-                  <fmt:message key="pointDetails.images"/>:
+                  <spring:message code="pointDetails.images"/>:
                   <input id="flipbookLimit" style="text-align:right;" type="text" value="${flipbookLimit}"
                           class="formVeryShort"/>
                   <tag:img id="flipbookChartImg" png="control_play_blue" title="pointDetails.getImages" 
@@ -334,7 +334,7 @@
         <div class="borderDiv marB">
           <table width="100%">
             <tr>
-              <td class="smallTitle"><fmt:message key="pointDetails.events"/></td>
+              <td class="smallTitle"><spring:message code="pointDetails.events"/></td>
               <td align="right">
                 <tag:img png="arrow_in" title="common.maximize" onclick="togglePanel(this, 'eventsTable');"/>
                 <a href=""><tag:img png="control_repeat_blue" title="common.refresh"/></a>
@@ -343,12 +343,12 @@
           </table>
           <table id="eventsTable" cellspacing="1" cellpadding="0" width="100%">
             <tr class="rowHeader">
-              <td><fmt:message key="pointDetails.id"/></td>
-              <td><fmt:message key="common.alarmLevel"/></td>
-              <td><fmt:message key="common.activeTime"/></td>
-              <td><fmt:message key="pointDetails.message"/></td>
-              <td><fmt:message key="common.status"/></td>
-              <td><fmt:message key="events.acknowledged"/></td>
+              <td><spring:message code="pointDetails.id"/></td>
+              <td><spring:message code="common.alarmLevel"/></td>
+              <td><spring:message code="common.activeTime"/></td>
+              <td><spring:message code="pointDetails.message"/></td>
+              <td><spring:message code="common.status"/></td>
+              <td><spring:message code="events.acknowledged"/></td>
             </tr>
             
             <c:forEach items="${events}" var="event" varStatus="status" end="19">
@@ -370,9 +370,9 @@
                         <td valign="top" width="16"><tag:img png="comment" title="notes.note"/></td>
                         <td valign="top">
                           <span class="copyTitle">
-                            ${comment.prettyTime} <fmt:message key="notes.by"/>
+                            ${comment.prettyTime} <spring:message code="notes.by"/>
                             <c:choose>
-                              <c:when test="${empty comment.username}"><fmt:message key="common.deleted"/></c:when>
+                              <c:when test="${empty comment.username}"><spring:message code="common.deleted"/></c:when>
                               <c:otherwise><c:out value="${comment.username}"/></c:otherwise>
                             </c:choose>
                           </span><br/>
@@ -385,10 +385,10 @@
                 <td>
                   <c:choose>
                     <c:when test="${event.active}">
-                      <fmt:message key="common.active"/>
+                      <spring:message code="common.active"/>
                       <a href="events.shtm"><tag:img png="flag_white" title="common.active"/></a>
                     </c:when>
-                    <c:when test="${!event.rtnApplicable}"><fmt:message key="common.nortn"/></c:when>
+                    <c:when test="${!event.rtnApplicable}"><spring:message code="common.nortn"/></c:when>
                     <c:otherwise>
                       ${sst:time(event.rtnTimestamp)} - <sst:i18n message="${event.rtnMessage}"/>
                     </c:otherwise>
@@ -403,10 +403,10 @@
               </tr>
             </c:forEach>
             <c:if test="${sst:size(events) > 20}">
-              <tr class="row"><td align="center" colspan="6"><fmt:message key="pointDetails.maxEvents"/> ${sst:size(events)}</td></tr>
+              <tr class="row"><td align="center" colspan="6"><spring:message code="pointDetails.maxEvents"/> ${sst:size(events)}</td></tr>
             </c:if>
             <c:if test="${empty events}">
-              <tr class="row"><td colspan="6"><fmt:message key="events.emptyList"/></td></tr>
+              <tr class="row"><td colspan="6"><spring:message code="events.emptyList"/></td></tr>
             </c:if>
           </table>
         </div>
@@ -420,21 +420,21 @@
     <tr>
       <td valign="top">
         <div class="borderDiv marR">
-          <span class="smallTitle" style="margin:3px;"><fmt:message key="pointDetails.views"/></span>
+          <span class="smallTitle" style="margin:3px;"><spring:message code="pointDetails.views"/></span>
           <table width="100%" cellspacing="1">
             <tr class="rowHeader">
-              <td><fmt:message key="pointDetails.name"/></td>
+              <td><spring:message code="pointDetails.name"/></td>
               <td></td>
             </tr>
             <c:forEach items="${views}" var="view" varStatus="status">
               <tr class="row<c:if test="${status.index % 2 == 1}">Alt</c:if>">
-                <td>${view.name}</td>
+                <td><c:out value="${view.name}"/></td>
                 <td align="center"><a href="views.shtm?viewId=${view.id}"><tag:img png="icon_view"
                         title="pointDetails.gotoView"/></a></td>
               </tr>
             </c:forEach>
             <c:if test="${empty views}">
-              <tr class="row"><td colspan="2"><fmt:message key="pointDetails.notInView"/></td></tr>
+              <tr class="row"><td colspan="2"><spring:message code="pointDetails.notInView"/></td></tr>
             </c:if>
           </table>
         </div>
@@ -443,12 +443,12 @@
       <c:if test="${isRoleAdmin}">
       <td colspan="2" valign="top">
         <div class="borderDiv">
-          <span class="smallTitle" style="margin:3px;"><fmt:message key="pointDetails.userAccess"/></span>
+          <span class="smallTitle" style="margin:3px;"><spring:message code="pointDetails.userAccess"/></span>
           <table width="100%" cellspacing="1">
             <tr class="rowHeader">
               <td width="16"></td>
-              <td><fmt:message key="pointDetails.username"/></td>
-              <td><fmt:message key="pointDetails.accessType"/></td>
+              <td><spring:message code="pointDetails.username"/></td>
+              <td><spring:message code="pointDetails.accessType"/></td>
             </tr>
             <c:forEach items="${users}" var="userData" varStatus="status">
               <tr class="row<c:if test="${status.index % 2 == 1}">Alt</c:if>">
@@ -457,11 +457,11 @@
                 <td><c:out value="${user.username}"/></td>
                 <td>
                   <c:choose>
-                    <c:when test="${userData.accessType == applicationScope['constants.Permissions.DataPointAccessTypes.READ']}"><fmt:message key="common.access.read"/></c:when>
-                    <c:when test="${userData.accessType == applicationScope['constants.Permissions.DataPointAccessTypes.SET']}"><fmt:message key="common.access.set"/></c:when>
-                    <c:when test="${userData.accessType == applicationScope['constants.Permissions.DataPointAccessTypes.DATA_SOURCE']}"><fmt:message key="common.access.dataSource"/></c:when>
-                    <c:when test="${userData.accessType == applicationScope['constants.Permissions.DataPointAccessTypes.ADMIN']}"><fmt:message key="common.access.admin"/></c:when>
-                    <c:otherwise><fmt:message key="common.unknown"/> (${userData.accessType})</c:otherwise>
+                    <c:when test="${userData.accessType == applicationScope['constants.Permissions.DataPointAccessTypes.READ']}"><spring:message code="common.access.read"/></c:when>
+                    <c:when test="${userData.accessType == applicationScope['constants.Permissions.DataPointAccessTypes.SET']}"><spring:message code="common.access.set"/></c:when>
+                    <c:when test="${userData.accessType == applicationScope['constants.Permissions.DataPointAccessTypes.DATA_SOURCE']}"><spring:message code="common.access.dataSource"/></c:when>
+                    <c:when test="${userData.accessType == applicationScope['constants.Permissions.DataPointAccessTypes.ADMIN']}"><spring:message code="common.access.admin"/></c:when>
+                    <c:otherwise><spring:message code="common.unknown"/> (${userData.accessType})</c:otherwise>
                   </c:choose>
                 </td>
               </tr>
diff --git a/WebContent/WEB-INF/jsp/dataPointEdit.jsp b/WebContent/WEB-INF/jsp/dataPointEdit.jsp
index 1ffb2da1b7..3075c6eeb8 100644
--- a/WebContent/WEB-INF/jsp/dataPointEdit.jsp
+++ b/WebContent/WEB-INF/jsp/dataPointEdit.jsp
@@ -69,14 +69,14 @@
     <input type="hidden" id="taskName" name="asdf" value=""/>
     <table width="100%" cellpadding="0" cellspacing="0">
       <tr>
-        <td valign="top">
+        <td valign="top" width="60%">
           <%@ include file="/WEB-INF/jsp/pointEdit/pointProperties.jsp" %>
           <%@ include file="/WEB-INF/jsp/pointEdit/loggingProperties.jsp" %>
           <%@ include file="/WEB-INF/jsp/pointEdit/eventTextRenderer.jsp"%>
           <%@ include file="/WEB-INF/jsp/pointEdit/textRenderer.jsp" %>
           <%@ include file="/WEB-INF/jsp/pointEdit/chartRenderer.jsp" %>
         </td>
-        <td valign="top">
+        <td valign="top" width="40%">
           <%@ include file="/WEB-INF/jsp/pointEdit/eventDetectors.jsp" %>
         </td>
       </tr>
@@ -396,13 +396,9 @@
                       }
                   }
                   // const
-                  var pathArray = location.href.split( '/' );
-                  var protocol = pathArray[0];
-                  var host = pathArray[2];
-                  var appScada = pathArray[3];
                   var myLocation;
                   if (!myLocation) {
-                    myLocation = protocol + "//" + host + "/" + appScada + "/";
+                    myLocation = getAppLocation();
                    }
 
                    var arrDictLoggingType = ["", "When point value changes", "All data", "Do not log", "Interval", "When point timestamp changes"];
@@ -813,7 +809,7 @@
                     jQuery.ajax({
                             type: "GET",
                             dataType: "json",
-                            url:myLocation+"/api/point_properties/getPropertiesBaseOnId/"+idPointConfigurationToBaseOnExistingPoint,
+                            url:myLocation+"api/point_properties/getPropertiesBaseOnId/"+idPointConfigurationToBaseOnExistingPoint,
                                                            success: function(properties){
                                                                 setConfig(properties);
                                                            },
@@ -836,7 +832,7 @@
                        jQuery.ajax({
                             type: "GET",
                             dataType: "json",
-                            url:myLocation+"/api/point_properties/getPropertiesBaseOnId/"+idPointConfigurationToBaseOnExistingPoint,
+                            url:myLocation+"api/point_properties/getPropertiesBaseOnId/"+idPointConfigurationToBaseOnExistingPoint,
                            					        	   success: function(properties){
 
                                                                     let bCheckedType = checkType(properties.dataTypeId);
@@ -901,26 +897,26 @@
                 <div class="borderDiv marB marR" style="margin:20px; padding:10px; border-color:blue; max-width: 800px;">
                     <table width="100%" cellpadding="0" cellspacing="0">
                         <tr><td colspan="4">
-                            <span class="smallTitle"> <fmt:message key="pointEdit.basing_on.title"/></span>
+                            <span class="smallTitle"> <spring:message code="pointEdit.basing_on.title"/></span>
                         </td></tr>
 
                         <tr>
-                            <td class="formLabelRequired"><fmt:message key="pointEdit.basing_on.select"/></td>
+                            <td class="formLabelRequired"><spring:message code="pointEdit.basing_on.select"/></td>
                             <td colspan="2" class="formField">
                                 <select id="selected_base_on_existing_point_chooser">
                                     <c:forEach items="${userPoints}" var="point">
-                                        <sst:option value="${point.id}">${point.extendedName}</sst:option>
+                                        <sst:option value="${point.id}"><c:out value="${point.extendedName}"/></sst:option>
                                     </c:forEach>
                                 </select>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input id="baseOnExistingPointBtn" type="button" value="<fmt:message key="pointEdit.basing_on.apply"/>" onclick="baseOnExistingPoint()">
+                                <input id="baseOnExistingPointBtn" type="button" value="<spring:message code="pointEdit.basing_on.apply"/>" onclick="baseOnExistingPoint()">
                             </td>
                             <td colspan="3">
                                 <input type="checkbox" id="checkGetAlertError" value="true" checked>
-                                <label for="checkGetAlertError"><fmt:message key="pointEdit.basing_on.warning_on"/></label>
+                                <label for="checkGetAlertError"><spring:message code="pointEdit.basing_on.warning_on"/></label>
                             </td>
                         </tr>
                     </table>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit.jsp
index 8d27421474..5b0055cdaa 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit.jsp
@@ -28,19 +28,19 @@
     function init() {
         var pointListColumnHeaders = new Array();
         
-        pointListColumnHeaders.push("<fmt:message key="dsEdit.name"/>");
+        pointListColumnHeaders.push("<spring:message code="dsEdit.name"/>");
         pointListColumnFunctions.push(function(p) { return "<b>"+ p.name +"</b>"; });
         
-        pointListColumnHeaders.push("<fmt:message key="dsEdit.pointDataType"/>");
+        pointListColumnHeaders.push("<spring:message code="dsEdit.pointDataType"/>");
         pointListColumnFunctions.push(function(p) { return p.dataTypeMessage; });
         
-        pointListColumnHeaders.push("<fmt:message key="dsEdit.status"/>");
+        pointListColumnHeaders.push("<spring:message code="dsEdit.status"/>");
         pointListColumnFunctions.push(function(p) {
                 var id = "toggleImg"+ p.id;
                 var onclick = "togglePoint("+ p.id +")";
                 if (p.enabled)
-                    return writeImage(id, null, "brick_go", "<fmt:message key="common.enabledToggle"/>", onclick);
-                return writeImage(id, null, "brick_stop", "<fmt:message key="common.disabledToggle"/>", onclick);
+                    return writeImage(id, null, "brick_go", "<spring:message code="common.enabledToggle"/>", onclick);
+                return writeImage(id, null, "brick_stop", "<spring:message code="common.disabledToggle"/>", onclick);
         });
         
         if (typeof appendPointListColumnFunctions == 'function')
@@ -51,9 +51,9 @@
 		});
         
         pointListColumnFunctions.push(function(p) {
-			return	writeImage("editImg" + p.id, null, "icon_ds_edit", "<fmt:message key='pointDetails.editPoint'/>", "editPoint(" + p.id + ")") +
-					writeImage("editImg" + p.id, null, "icon_comp_edit", "<fmt:message key='pointEdit.props.props'/>", "window.location='data_point_edit.shtm?dpid=" + p.id + "'") +
-					writeImage("editImg" + p.id, null, "icon_ds_add", "<fmt:message key='common.copy'/>", "copyDataPoint(" + ${dataSource.id} + ", " + p.id + ");");
+			return	writeImage("editImg" + p.id, null, "icon_ds_edit", "<spring:message code='pointDetails.editPoint'/>", "editPoint(" + p.id + ")") +
+					writeImage("editImg" + p.id, null, "icon_comp_edit", "<spring:message code='pointEdit.props.props'/>", "window.location='data_point_edit.shtm?dpid=" + p.id + "'") +
+					writeImage("editImg" + p.id, null, "icon_ds_add", "<spring:message code='common.copy'/>", "copyDataPoint(" + ${dataSource.id} + ", " + p.id + ");");
         });
 
         var headers = $("pointListHeaders");
@@ -115,9 +115,12 @@
         if (response.hasMessages)
             showDwrMessages(response.messages, "dataSourceGenericMessages");
         else {
-            showMessage("dataSourceMessage", "<fmt:message key="dsEdit.saved"/>");
-            DataSourceEditDwr.getPoints(writePointList);
-            window.location = "data_source_edit.shtm?dsid=" + response.data.id;
+			if (window.location.href.includes("typeId")) {
+				window.location = "data_source_edit.shtm?dsid=" + response.data.id;
+			} else {
+				showMessage("dataSourceMessage", "<spring:message code="dsEdit.saved"/>");
+				DataSourceEditDwr.getPoints(writePointList);
+			}
         }
         getAlarms();
   	  console.log("dataSourceEdit.jsp::saveDataSourceCB - done");
@@ -153,7 +156,7 @@
     }
 
     function deletePoint() {
-        if (confirm("<fmt:message key="dsEdit.deleteConfirm"/>")) {
+        if (confirm("<spring:message code="dsEdit.deleteConfirm"/>")) {
             DataSourceEditDwr.deletePoint(currentPoint.id, deletePointCB);
             startImageFader("pointDeleteImg", true);
         }
@@ -182,7 +185,7 @@
 
     function addPoint(ref) {
         if (!dojo.html.isShowing("pointProperties")) {
-            alert("<fmt:message key="dsEdit.saveWarning"/>");
+            alert("<spring:message code="dsEdit.saveWarning"/>");
             return;
         }
 
@@ -264,7 +267,7 @@
         else {
             writePointList(response.data.points);
             editPoint(response.data.id);
-            showMessage("pointMessage", "<fmt:message key="dsEdit.pointSaved"/>");
+            showMessage("pointMessage", "<spring:message code="dsEdit.pointSaved"/>");
         }
     }
 
@@ -327,6 +330,14 @@
     	stopImageFader($("enableAllImg"));
     	writePointList(points);
     }
+
+    function escapePoints(points) {
+        for(var i=0; i < points.length; i++) {
+            var point = points[i];
+            point.name = escapeHtml(point.name);
+            point.xid = escapeHtml(point.xid);
+        }
+    }
     
     function copyDataPoint(fromDataSourceId, dataPointId) {
         return DataSourceEditDwr.copyDataPoint(fromDataSourceId, dataPointId, function(response) {
@@ -341,8 +352,8 @@
 			<td>
 				<table width="100%">
 					<tr>
-						<td class="smallTitle"><fmt:message
-								key="dsEdit.currentAlarms" />
+						<td class="smallTitle"><spring:message
+								code="dsEdit.currentAlarms" />
 						</td>
 						<td align="right"><tag:img png="control_repeat_blue"
 								title="common.refresh" onclick="getAlarms()" />
@@ -351,7 +362,7 @@
 				</table>
 				<table>
 					<tr id="noAlarmsMsg">
-						<td><b><fmt:message key="dsEdit.noAlarms" />
+						<td><b><spring:message code="dsEdit.noAlarms" />
 						</b>
 						</td>
 					</tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/dsHead.jspf b/WebContent/WEB-INF/jsp/dataSourceEdit/dsHead.jspf
index 13930520da..31878fdfc5 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/dsHead.jspf
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/dsHead.jspf
@@ -37,10 +37,10 @@
         <div id="dataSourceMessage" class="ctxmsg formError"></div>
         <table>
           <tr>
-            <td class="formLabelRequired"><fmt:message key="dsEdit.head.name"/></td>
-            <td class="formField"><input type="text" id="dataSourceName" value="${dataSource.name}"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.head.name"/></td>
+            <td class="formField"><input type="text" id="dataSourceName" value="<c:out value="${dataSource.name}"/>"/></td>
           </tr>
           <tr>
-            <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
-            <td class="formField"><input type="text" id="dataSourceXid" value="${dataSource.xid}"/></td>
+            <td class="formLabelRequired"><spring:message code="common.xid"/></td>
+            <td class="formField"><input type="text" id="dataSourceXid" value="<c:out value="${dataSource.xid}"/>"/></td>
           </tr>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editAlpha2.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editAlpha2.jsp
index 4e1a914b01..ef8cd6ea5c 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editAlpha2.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editAlpha2.jsp
@@ -59,13 +59,13 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.alpha2.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.alpha2.desc"/></c:set>
 <c:set var="dsHelpId" value="asciiSerialDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.asciiSerial.commPortId" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.asciiSerial.commPortId" /></td>
 	<td class="formField"><c:choose>
 		<c:when test="${!empty commPortError}">
 			<input id="commPortId" type="hidden" value="" />
@@ -82,8 +82,8 @@
 </tr>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.asciiSerial.baud" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.asciiSerial.baud" /></td>
 	<td class="formField"><sst:select id="baudRate"
 		value="${dataSource.baudRate}">
 		<sst:option>110</sst:option>
@@ -103,7 +103,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.dataBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.dataBits"/></td>
   <td class="formField">
     <sst:select id="dataBits" value="${dataSource.dataBits}">
       <sst:option value="5">5</sst:option>
@@ -115,7 +115,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.stopBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.stopBits"/></td>
   <td class="formField">
     <sst:select id="stopBits" value="${dataSource.stopBits}">
       <sst:option value="1">1</sst:option>
@@ -126,20 +126,20 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.parity"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.parity"/></td>
   <td class="formField">
     <sst:select id="parity" value="${dataSource.parity}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.parity.none"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.modbusSerial.parity.odd"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.modbusSerial.parity.even"/></sst:option>
-      <sst:option value="3"><fmt:message key="dsEdit.modbusSerial.parity.mark"/></sst:option>
-      <sst:option value="4"><fmt:message key="dsEdit.modbusSerial.parity.space"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.parity.none"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.modbusSerial.parity.odd"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.modbusSerial.parity.even"/></sst:option>
+      <sst:option value="3"><spring:message code="dsEdit.modbusSerial.parity.mark"/></sst:option>
+      <sst:option value="4"><spring:message code="dsEdit.modbusSerial.parity.space"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -149,16 +149,16 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.retries"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.retries"/></td>
     <td class="formField"><input type="text" id="retries" value="${dataSource.retries}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.timeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.timeout"/></td>
     <td class="formField"><input type="text" id="timeout" value="${dataSource.timeout}"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.alpha2.station"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.alpha2.station"/></td>
     <td class="formField">
     	<input id="station" type="text" value="${dataSource.station}"/>
     </td>
@@ -168,40 +168,40 @@
 
 <tag:pointList pointHelpId="asciiSerialPP">
   <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.alpha2.pointType"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.alpha2.pointType"/></td>
           <td class="formField"> 
             <select id="deviceCode" onchange="deviceCodeChanged()">
-              <option value="<c:out value="<%= Alpha2PointLocatorVO.RUN_STOP_CODE %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.runStop"/></option>
-              <option value="<c:out value="<%= DeviceCodes.SYSTEM_BIT.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.systemBit"/></option>
-              <option value="<c:out value="<%= DeviceCodes.INPUT_TERMINAL.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.inputTerminal"/></option>
-              <option value="<c:out value="<%= DeviceCodes.EXTERNAL_INPUT.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.externalInput"/></option>
-              <option value="<c:out value="<%= DeviceCodes.OUTPUT_TERMINAL.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.outputTerminal"/></option>
-              <option value="<c:out value="<%= DeviceCodes.EXTERNAL_OUTPUT.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.externalOutput"/></option>
-              <option value="<c:out value="<%= DeviceCodes.KEY_INPUT.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.keyInput"/></option>
-              <option value="<c:out value="<%= DeviceCodes.LINK_INPUT.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.linkInput"/></option>
-              <option value="<c:out value="<%= DeviceCodes.LINK_OUTPUT.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.linkOutput"/></option>
-              <option value="<c:out value="<%= DeviceCodes.CONTROL_DEVICE.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.controlDevice"/></option>
-              <option value="<c:out value="<%= DeviceCodes.ANALOG_IN.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.analogIn"/></option>
-              <option value="<c:out value="<%= DeviceCodes.COMM_BIT_DEVICE.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.commBitDevice"/></option>
-              <option value="<c:out value="<%= DeviceCodes.COMM_WORD_DEVICE.getId() %>"/>"><fmt:message key="dsEdit.alpha2.deviceCode.commWordDevice"/></option>
+              <option value="<c:out value="<%= Alpha2PointLocatorVO.RUN_STOP_CODE %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.runStop"/></option>
+              <option value="<c:out value="<%= DeviceCodes.SYSTEM_BIT.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.systemBit"/></option>
+              <option value="<c:out value="<%= DeviceCodes.INPUT_TERMINAL.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.inputTerminal"/></option>
+              <option value="<c:out value="<%= DeviceCodes.EXTERNAL_INPUT.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.externalInput"/></option>
+              <option value="<c:out value="<%= DeviceCodes.OUTPUT_TERMINAL.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.outputTerminal"/></option>
+              <option value="<c:out value="<%= DeviceCodes.EXTERNAL_OUTPUT.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.externalOutput"/></option>
+              <option value="<c:out value="<%= DeviceCodes.KEY_INPUT.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.keyInput"/></option>
+              <option value="<c:out value="<%= DeviceCodes.LINK_INPUT.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.linkInput"/></option>
+              <option value="<c:out value="<%= DeviceCodes.LINK_OUTPUT.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.linkOutput"/></option>
+              <option value="<c:out value="<%= DeviceCodes.CONTROL_DEVICE.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.controlDevice"/></option>
+              <option value="<c:out value="<%= DeviceCodes.ANALOG_IN.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.analogIn"/></option>
+              <option value="<c:out value="<%= DeviceCodes.COMM_BIT_DEVICE.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.commBitDevice"/></option>
+              <option value="<c:out value="<%= DeviceCodes.COMM_WORD_DEVICE.getId() %>"/>"><spring:message code="dsEdit.alpha2.deviceCode.commWordDevice"/></option>
             </select>
           </td>
         </tr>
   <tr>
   
   <tbody id="accessModeDiv"> 
-  	<td class="formLabelRequired"><fmt:message key="dsEdit.alpha2.deviceNumber"/></td>
+  	<td class="formLabelRequired"><spring:message code="dsEdit.alpha2.deviceNumber"/></td>
 	  	<td class="formField">
 		<input id="deviceNumber" type="text" value=""/>
 	</td>
 	
 		<tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.alpha2.accessMode"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.alpha2.accessMode"/></td>
           <td class="formField"> 
             <select id="accessMode">
-              <option value="<c:out value="<%= Alpha2PointLocatorVO.READ_ONLY %>"/>"><fmt:message key="dsEdit.alpha2.accessMode.readOnly"/></option>
-              <option value="<c:out value="<%= Alpha2PointLocatorVO.WRITE_ONLY %>"/>"><fmt:message key="dsEdit.alpha2.accessMode.writeOnly"/></option>
-              <option value="<c:out value="<%= Alpha2PointLocatorVO.READ_WRITE %>"/>"><fmt:message key="dsEdit.alpha2.accessMode.readWrite"/></option>
+              <option value="<c:out value="<%= Alpha2PointLocatorVO.READ_ONLY %>"/>"><spring:message code="dsEdit.alpha2.accessMode.readOnly"/></option>
+              <option value="<c:out value="<%= Alpha2PointLocatorVO.WRITE_ONLY %>"/>"><spring:message code="dsEdit.alpha2.accessMode.writeOnly"/></option>
+              <option value="<c:out value="<%= Alpha2PointLocatorVO.READ_WRITE %>"/>"><spring:message code="dsEdit.alpha2.accessMode.readWrite"/></option>
             </select>
           </td>
         </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editAmqp.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editAmqp.jsp
index 83daca0cdf..3d661ee1e2 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editAmqp.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editAmqp.jsp
@@ -41,7 +41,7 @@
         if(isValid(dataSourceToSave.updateAttempts)) {
             DataSourceEditDwr.saveAmqpDataSource(dataSourceToSave, saveDataSourceCB);
         } else {
-            let message = createValidationMessage("updateAttempts","<fmt:message key="badIntegerFormat"/>");
+            let message = createValidationMessage("updateAttempts","<spring:message code="badIntegerFormat"/>");
             showDwrMessages([message]);
             stopImageFader("dsSaveImg");
         }
@@ -79,17 +79,17 @@
     currentPoint.id, $get("xid"), $get("name"), locator, savePointCB);
     }
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions)  {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.amqp.exchangeType"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.amqp.exchangeType"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.exchangeType; };
   }
 </script>
 
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.amqp.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.amqp.desc"/></c:set>
 <c:set var="dsHelpId" value="amqpDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -98,27 +98,27 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.updateAttempts"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.messaging.updateAttempts"/></td>
     <td class="formField"><input type="text" id="updateAttempts" value="${dataSource.updateAttempts}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serverHost"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serverHost"/></td>
     <td class="formField"><input type="text" id="serverHost" value="${dataSource.serverHost}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serverPortNumber"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serverPortNumber"/></td>
     <td class="formField"><input type="number" id="serverPortNumber" value="${dataSource.serverPortNumber}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serverUsername"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serverUsername"/></td>
     <td class="formField"><input type="text" id="serverUsername" value="${dataSource.serverUsername}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serverPassword"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serverPassword"/></td>
     <td class="formField"><input type="text" id="serverPassword" value="${dataSource.serverPassword}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.protocolVersion"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.messaging.protocolVersion"/></td>
     <td class="formField">
         <select id="protocolVersion">
             <option value="<c:out value="<%= AmqpVersion.V0_9_1_EXT_AMQP %>"/>" ${dataSource.protocolVersion.name == 'V0_9_1_EXT_AMQP' ? 'selected' : ''} ><c:out value='<%= AmqpVersion.V0_9_1_EXT_AMQP.getVersion() %>'/></option>
@@ -126,7 +126,7 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.brokerMode"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.messaging.brokerMode"/></td>
     <td class="formField">
         <select id="brokerMode">
             <option value="<c:out value="<%= BrokerMode.NATIVE %>"/>" ${dataSource.brokerMode == 'NATIVE' ? 'selected' : ''} >Native</option>
@@ -134,23 +134,23 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.serverVirtualhost"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.amqp.serverVirtualhost"/></td>
     <td class="formField"><input type="text" id="serverVirtualHost" value="${dataSource.serverVirtualHost}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.connectionTimeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.connectionTimeout"/></td>
     <td class="formField"><input type="number" id="connectionTimeout" value="${dataSource.connectionTimeout}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.channelRpcTimeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.amqp.channelRpcTimeout"/></td>
     <td class="formField"><input type="number" id="channelRpcTimeout" value="${dataSource.channelRpcTimeout}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.automaticRecoveryEnabled"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.amqp.automaticRecoveryEnabled"/></td>
     <td class="formField"><input type="checkbox" id="automaticRecoveryEnabled" ${dataSource.automaticRecoveryEnabled ? 'checked' : 'unchecked'} /></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.networkRecoveryInterval"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.amqp.networkRecoveryInterval"/></td>
     <td class="formField"><input type="number" id="networkRecoveryInterval" value="${dataSource.networkRecoveryInterval}"/></td>
   </tr>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsEventsFoot.jspf" %>
@@ -158,16 +158,16 @@
 <tag:pointList pointHelpId="amqpPP">
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.settable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.settable"/></td>
     <td class="formField"><input type="checkbox" id="settable"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.writable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.writable"/></td>
     <td class="formField"><input type="checkbox" id="writable"/></td>
    </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId">
         <tag:dataTypeOptions excludeMultistate="true" excludeImage="true" />
@@ -176,7 +176,7 @@
   </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.exchangeType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.amqp.exchangeType"/></td>
     <td class="formField">
         <select id="exchangeType" onchange="exchangeTypeChange()">
             <option value="<c:out value="<%= ExchangeType.NONE %>"/>">Empty</option>
@@ -187,31 +187,31 @@
     </td>
   </tr>
   <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.queueName"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.messaging.queueName"/></td>
       <td class="formField"><input type="text" id="queueName"/></td>
   </tr>
   <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.exchangeName"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.amqp.exchangeName"/></td>
       <td class="formField"><input type="text" id="exchangeName"/></td>
   </tr>
   <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.routingKey"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.amqp.routingKey"/></td>
       <td class="formField"><input type="text" id="routingKey"/></td>
   </tr>
   <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.qos"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.messaging.qos"/></td>
       <td class="formField"><input type="number" id="qos"/></td>
   </tr>
   <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.autoDelete"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.amqp.autoDelete"/></td>
       <td class="formField"><input type="checkbox" id="autoDelete"/></td>
   </tr>
   <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.internal"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.amqp.internal"/></td>
       <td class="formField"><input type="checkbox" id="internal"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.durability"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.amqp.durability"/></td>
     <td class="formField">
         <select id="durability">
             <option value="<c:out value="<%= DurabilityType.DURABLE %>"/>">Durable</option>
@@ -220,7 +220,7 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.amqp.messageAck"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.amqp.messageAck"/></td>
     <td class="formField">
         <select id="messageAck">
             <option value="<c:out value="<%= MessageAckType.NO_ACK %>"/>">No ACK</option>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editAsciiFile.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editAsciiFile.jsp
index 1bce56e9fa..db1bd72c18 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editAsciiFile.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editAsciiFile.jsp
@@ -61,7 +61,7 @@
 	  if(exists) {
 		  alert('Arquivo OK!');
 	  } else {
-		  alert('Arquivo n�o encontrado!');
+		  alert('Arquivo n�o encontrado!');
 	  }
   }	
   
@@ -111,11 +111,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.asciiFile.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.asciiFile.desc"/></c:set>
 <c:set var="dsHelpId" value="asciiFileReaderDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -124,21 +124,21 @@
     </td>
   </tr>
   <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.quantize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.quantize"/></td>
           <td class="formField"><sst:checkbox id="quantize" selectedValue="${dataSource.quantize}"/></td>
   </tr>
   <tr>
-	<td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.filePath"/></td>
+	<td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.filePath"/></td>
   	<td class="formField"><input id="filePath" type="text" value="${dataSource.filePath}"/></td>
   	<td>
-		<input id="checkBtn" type="button" value="<fmt:message key="dsEdit.asciiFile.checkFile"/>" onclick="checkFile();" />
+		<input id="checkBtn" type="button" value="<spring:message code="dsEdit.asciiFile.checkFile"/>" onclick="checkFile();" />
 	</td>
   </tr>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsEventsFoot.jspf" %>
 
 <tag:pointList pointHelpId="asciiFileReaderPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -146,21 +146,21 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.valueRegex"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.valueRegex"/></td>
     <td class="formField">
     	<input id="valueRegex" type="text" value=""/>
     	<select id="valueSuggestions" onchange="valueSuggestChanged();">
     		<option value=""> &nbsp; </option>
-        	<option value="((\b[0-9]+)?\.)?[0-9]+\b"> <fmt:message key="dsEdit.asciiFile.regex.number"/>  </option>
+        	<option value="((\b[0-9]+)?\.)?[0-9]+\b"> <spring:message code="dsEdit.asciiFile.regex.number"/>  </option>
       	</select>
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampCheck"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampCheck"/></td>
     <td class="formField"><input id="customTimestamp" type="checkbox" onchange="checkTimestampChanged();"/></td>
   </tr>
 	  <tr id="tsDiv1">
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampFormat"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampFormat"/></td>
 	    <td class="formField">
 	    	<input id="timestampFormat" type="text" value=""/>
 	    	<select id="timestampSuggestions" onchange="timestampSuggestChanged();">
@@ -173,7 +173,7 @@
 	    </td>
 	  </tr>
 	  <tr id="tsDiv2">
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampRegex"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampRegex"/></td>
 	    <td class="formField">
 	    	<input id="timestampRegex" type="text" value=""/>
 	    </td>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editAsciiSerial.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editAsciiSerial.jsp
index f1b8c5f0da..05f771cd1f 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editAsciiSerial.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editAsciiSerial.jsp
@@ -144,13 +144,13 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.asciiSerial.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.asciiSerial.desc"/></c:set>
 <c:set var="dsHelpId" value="asciiSerialDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.asciiSerial.commPortId" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.asciiSerial.commPortId" /></td>
 	<td class="formField"><c:choose>
 		<c:when test="${!empty commPortError}">
 			<input id="commPortId" type="hidden" value="" />
@@ -167,8 +167,8 @@
 </tr>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.asciiSerial.baud" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.asciiSerial.baud" /></td>
 	<td class="formField"><sst:select id="baudRate"
 		value="${dataSource.baudRate}">
 		<sst:option>110</sst:option>
@@ -188,7 +188,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.dataBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.dataBits"/></td>
   <td class="formField">
     <sst:select id="dataBits" value="${dataSource.dataBits}">
       <sst:option value="5">5</sst:option>
@@ -200,7 +200,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.stopBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.stopBits"/></td>
   <td class="formField">
     <sst:select id="stopBits" value="${dataSource.stopBits}">
       <sst:option value="1">1</sst:option>
@@ -211,20 +211,20 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.parity"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.parity"/></td>
   <td class="formField">
     <sst:select id="parity" value="${dataSource.parity}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.parity.none"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.modbusSerial.parity.odd"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.modbusSerial.parity.even"/></sst:option>
-      <sst:option value="3"><fmt:message key="dsEdit.modbusSerial.parity.mark"/></sst:option>
-      <sst:option value="4"><fmt:message key="dsEdit.modbusSerial.parity.space"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.parity.none"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.modbusSerial.parity.odd"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.modbusSerial.parity.even"/></sst:option>
+      <sst:option value="3"><spring:message code="dsEdit.modbusSerial.parity.mark"/></sst:option>
+      <sst:option value="4"><spring:message code="dsEdit.modbusSerial.parity.space"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -234,67 +234,67 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.retries"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.retries"/></td>
     <td class="formField"><input type="text" id="retries" value="${dataSource.retries}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.timeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.timeout"/></td>
     <td class="formField"><input type="text" id="timeout" value="${dataSource.timeout}"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.quantize"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.quantize"/></td>
     <td class="formField"><sst:checkbox id="quantize" selectedValue="${dataSource.quantize}"/></td>
   </tr>
   
   <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.stopMode"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.stopMode"/></td>
   <td class="formField">
     <sst:select id="stopMode" onchange="changeStopMode()" value="${dataSource.stopMode}">
-      <sst:option value="0"><fmt:message key="dsEdit.asciiSerial.stopMode.nChar"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.asciiSerial.stopMode.charX"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.asciiSerial.stopMode.stopTimeout"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.asciiSerial.stopMode.nChar"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.asciiSerial.stopMode.charX"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.asciiSerial.stopMode.stopTimeout"/></sst:option>
     </sst:select>
   </td>
 </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.nChar"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.nChar"/></td>
     <td class="formField">
     	<input id="nChar" type="text" value="${dataSource.nChar}"/>
     </td>
   </tr>
   <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.charStopMode"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.charStopMode"/></td>
   <td class="formField">
     <sst:select id="charStopMode" onchange="changeCharStopMode()" value="${dataSource.charStopMode}">
-      <sst:option value="0"><fmt:message key="dsEdit.asciiSerial.charStopMode.charASCII"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.asciiSerial.charStopMode.hexValue"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.asciiSerial.charStopMode.charASCII"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.asciiSerial.charStopMode.hexValue"/></sst:option>
     </sst:select>
   </td>
 </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.charStopMode.charASCII"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.charStopMode.charASCII"/></td>
     <td class="formField">
     	<input id="charX" type="text" value="${dataSource.charX}" disabled="disabled"/>
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.charStopMode.hexValue"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.charStopMode.hexValue"/></td>
     <td class="formField">
     	<input id="hexValue" type="text" value="${dataSource.hexValue}" disabled="disabled"/>
     </td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.stopTimeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.stopTimeout"/></td>
     <td class="formField">
     	<input id="stopTimeout" type="text" value="${dataSource.stopTimeout}" disabled="disabled"/>
     </td>
   </tr>
    
   <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.bufferSize"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.bufferSize"/></td>
   <td class="formField">
     <sst:select id="bufferSize" value="${dataSource.bufferSize}">
       <sst:option value="2">2</sst:option>
@@ -310,7 +310,7 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.initString"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.initString"/></td>
     <td class="formField">
     	<input id="initString" type="text" value=""/>
     </td>
@@ -320,7 +320,7 @@
 
 <tag:pointList pointHelpId="asciiSerialPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -328,27 +328,27 @@
     </td>
   </tr>
   <tr>
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.command"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.command"/></td>
 	    <td class="formField">
 	    	<input id="command" type="text" value=""/>
 	    </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.valueRegex"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.valueRegex"/></td>
     <td class="formField">
     	<input id="valueRegex" type="text" value=""/>
     	<select id="valueSuggestions" onchange="valueSuggestChanged();">
     		<option value=""> &nbsp; </option>
-        	<option value="((\b[0-9]+)?\.)?[0-9]+\b"> <fmt:message key="dsEdit.asciiFile.regex.number"/>  </option>
+        	<option value="((\b[0-9]+)?\.)?[0-9]+\b"> <spring:message code="dsEdit.asciiFile.regex.number"/>  </option>
       	</select>
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampCheck"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampCheck"/></td>
     <td class="formField"><input id="customTimestamp" type="checkbox" onchange="checkTimestampChanged();"/></td>
   </tr>
 	  <tr id="tsDiv1">
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampFormat"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampFormat"/></td>
 	    <td class="formField">
 	    	<input id="timestampFormat" type="text" value=""/>
 	    	<select id="timestampSuggestions" onchange="timestampSuggestChanged();">
@@ -361,7 +361,7 @@
 	    </td>
 	  </tr>
 	  <tr id="tsDiv2">
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampRegex"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampRegex"/></td>
 	    <td class="formField">
 	    	<input id="timestampRegex" type="text" value=""/>
 	    </td>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editBacnetIp.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editBacnetIp.jsp
index 40105df43e..bcc3eda9f9 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editBacnetIp.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editBacnetIp.jsp
@@ -27,7 +27,7 @@
   }
   
   function sendWhoIs() {
-      $set("whoIsMessage", "<fmt:message key="dsEdit.bacnetIp.sendingWhoIs"/>");
+      $set("whoIsMessage", "<spring:message code="dsEdit.bacnetIp.sendingWhoIs"/>");
       dwr.util.removeAllRows("iamsReceived");
       whoIsButtons(true);
       DataSourceEditDwr.sendBACnetWhoIs($get("deviceId"), $get("broadcastAddress"), $get("port"), $get("timeout"), 
@@ -51,7 +51,7 @@
                       function(device) { return device.value; },
                       function(device) {
                           return writeImage("deviceDetailsImg"+ device.key, null, "control_play_blue",
-                                  "<fmt:message key="dsEdit.bacnetIp.getDetails"/>", "getDeviceDetails("+ device.key +")");
+                                  "<spring:message code="dsEdit.bacnetIp.getDetails"/>", "getDeviceDetails("+ device.key +")");
                       }
                   ],
                   {
@@ -97,12 +97,12 @@
           obj = result.deviceDetails[i];
           objectNode = dojo.widget.createWidget("TreeNode", {
                   title: obj.objectName +" ("+ obj.objectTypeDescription +") "+ writeImageSQuote(null, null,
-                          "icon_comp_add", "<fmt:message key="dsEdit.bacnetIp.addPoint"/>", "addPoint("+ i +")"),
+                          "icon_comp_add", "<spring:message code="dsEdit.bacnetIp.addPoint"/>", "addPoint("+ i +")"),
                   isFolder: "true"});
           parentNode.addChild(objectNode);
           
           objectNode.addChild(dojo.widget.createWidget("TreeNode",
-                  { title: "<fmt:message key="dsEdit.bacnetIp.presentValue"/>: "+ obj.prettyPresentValue}));
+                  { title: "<spring:message code="dsEdit.bacnetIp.presentValue"/>: "+ obj.prettyPresentValue}));
       }
       
       parentNode.expand();
@@ -125,7 +125,7 @@
   }
   
   function cancelWhoIsCB() {
-      $set("whoIsMessage", "<fmt:message key="dsEdit.bacnetIp.listenerStopped"/>");
+      $set("whoIsMessage", "<spring:message code="dsEdit.bacnetIp.listenerStopped"/>");
       whoIsButtons(false);
   }
   
@@ -176,8 +176,21 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.bacnetIp.device"/>";
-      pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.remoteDeviceIp; };
+    pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.bacnetIp.device"/>";
+    pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return '<div style="text-align: center;">' + p.pointLocator.remoteDeviceIp + '</div>';};
+    pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.bacnetIp.objectType"/>";
+    pointListColumnFunctions[pointListColumnFunctions.length] = function (p) {
+      const element = document.createElement("div");
+      element.style.textAlign = "center";
+
+      DataSourceEditDwr.getObjectTypeName(p.pointLocator.objectTypeId, function (result) {
+        element.innerHTML = result;
+      });
+
+      return element;
+    };
+    pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.bacnetIp.objectInstanceNumber"/>";
+    pointListColumnFunctions[pointListColumnFunctions.length] = function(p) {return '<div style="text-align: center;">' + p.pointLocator.objectInstanceNumber + '</div>';};
   }
 
   function editPointCBImpl(locator) {
@@ -235,11 +248,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.bacnetIp.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.bacnetIp.desc"/></c:set>
 <c:set var="dsHelpId" value="bacnetIpDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -249,45 +262,45 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.deviceId"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.deviceId"/></td>
           <td class="formField"><input id="deviceId" type="text" value="${dataSource.deviceId}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.broadcastAddress"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.broadcastAddress"/></td>
           <td class="formField"><input id="broadcastAddress" type="text" value="${dataSource.broadcastAddress}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.port"/></td>
           <td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.timeout"/></td>
           <td class="formField"><input id="timeout" type="text" value="${dataSource.timeout}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.segmentTimeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.segmentTimeout"/></td>
           <td class="formField"><input id="segTimeout" type="text" value="${dataSource.segTimeout}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.segmentWindow"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.segmentWindow"/></td>
           <td class="formField"><input id="segWindow" type="text" value="${dataSource.segWindow}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.retries"/></td>
           <td class="formField"><input id="retries" type="text" value="${dataSource.retries}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.covLease"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.covLease"/></td>
           <td class="formField"><input id="covSubscriptionTimeoutMinutes" type="text" 
                   value="${dataSource.covSubscriptionTimeoutMinutes}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.maxReadMultSeg"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.maxReadMultSeg"/></td>
           <td class="formField"><input id="maxReadMultipleReferencesSegmented" type="text" 
                   value="${dataSource.maxReadMultipleReferencesSegmented}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.maxReadMultNonseg"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.maxReadMultNonseg"/></td>
           <td class="formField"><input id="maxReadMultipleReferencesNonsegmented" type="text" 
                   value="${dataSource.maxReadMultipleReferencesNonsegmented}"/></td>
         </tr>
@@ -300,15 +313,15 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.bacnetIp.discovery"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.bacnetIp.discovery"/></td></tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.port"/></td>
           <td class="formField"><input id="whoIsPort" type="text" class="formShort"/></td>
         </tr>
         <tr>
           <td colspan="2" align="center">
-            <input id="sendWhoIsBtn" type="button" value="<fmt:message key="dsEdit.bacnetIp.sendWhoIs"/>" onclick="sendWhoIs();"/>
-            <input id="cancelWhoIsBtn" type="button" value="<fmt:message key="common.cancel"/>" onclick="cancelWhoIs();"/>
+            <input id="sendWhoIsBtn" type="button" value="<spring:message code="dsEdit.bacnetIp.sendWhoIs"/>" onclick="sendWhoIs();"/>
+            <input id="cancelWhoIsBtn" type="button" value="<spring:message code="common.cancel"/>" onclick="cancelWhoIs();"/>
           </td>
         </tr>
         
@@ -318,7 +331,7 @@
           <td colspan="2">
             <table cellspacing="1">
               <tr class="rowHeader">
-                <td><fmt:message key="dsEdit.bacnetIp.deviceAddress"/></td>
+                <td><spring:message code="dsEdit.bacnetIp.deviceAddress"/></td>
                 <td></td>
               </tr>
               <tbody id="iamsReceived"></tbody>
@@ -327,7 +340,7 @@
         </tr>
         
         <tbody id="deviceDetailsMessage" style="display:none;" class="formError">
-          <tr><td colspan="2"><fmt:message key="dsEdit.bacnetIp.gettingDeviceDetails"/></td></tr>
+          <tr><td colspan="2"><spring:message code="dsEdit.bacnetIp.gettingDeviceDetails"/></td></tr>
         </tbody>
         <tbody id="deviceDetails">
           <tr><td colspan="2"><div dojoType="Tree" toggle="wipe" widgetId="deviceDetailsTree"></div></td></tr>
@@ -337,30 +350,30 @@
     
     <div class="borderDiv marB">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.bacnetIp.objectList"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.bacnetIp.objectList"/></td></tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.remoteDeviceIp"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.remoteDeviceIp"/></td>
           <td class="formField"><input id="objListIp" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.remoteDevicePort"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.remoteDevicePort"/></td>
           <td class="formField"><input id="objListPort" type="text" class="formShort"/></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.bacnetIp.remoteDeviceNetworkNumber"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.bacnetIp.remoteDeviceNetworkNumber"/></td>
           <td class="formField"><input id="objListNetNumber" type="text" class="formShort"/></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.bacnetIp.remoteDeviceNetworkAddress"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.bacnetIp.remoteDeviceNetworkAddress"/></td>
           <td class="formField"><input id="objListNetAddr" type="text" class="formShort"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.remoteDeviceInstanceNumber"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.remoteDeviceInstanceNumber"/></td>
           <td class="formField"><input id="objListDevId" type="text" class="formShort"/></td>
         </tr>
         <tr>
           <td colspan="2" align="center">
-            <input id="sendObjListBtn" type="button" value="<fmt:message key="dsEdit.bacnetIp.sendObjList"/>" onclick="sendObjListRequest();"/>
+            <input id="sendObjListBtn" type="button" value="<spring:message code="dsEdit.bacnetIp.sendObjList"/>" onclick="sendObjListRequest();"/>
           </td>
         </tr>
         
@@ -372,76 +385,76 @@
 
 <tag:pointList pointHelpId="bacnetIpPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.remoteDeviceIp"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.remoteDeviceIp"/></td>
     <td class="formField"><input type="text" id="remoteDeviceIp"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.remoteDevicePort"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.remoteDevicePort"/></td>
     <td class="formField"><input type="text" id="remoteDevicePort"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.remoteDeviceNetworkNumber"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.remoteDeviceNetworkNumber"/></td>
     <td class="formField"><input type="text" id="networkNumber"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.remoteDeviceNetworkAddress"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.remoteDeviceNetworkAddress"/></td>
     <td class="formField"><input type="text" id="networkAddress"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.remoteDeviceInstanceNumber"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.remoteDeviceInstanceNumber"/></td>
     <td class="formField"><input type="text" id="remoteDeviceInstanceNumber"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.objectType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.objectType"/></td>
     <td class="formField">
       <select name="objectTypeId" onchange="objectTypeChanged()">
-        <option value="<c:out value="<%= ObjectType.accessDoor.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.accessDoor"/></option>
-        <option value="<c:out value="<%= ObjectType.accumulator.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.accumulator"/></option>
-        <option value="<c:out value="<%= ObjectType.analogInput.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.analogInput"/></option>
-        <option value="<c:out value="<%= ObjectType.analogOutput.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.analogOutput"/></option>
-        <option value="<c:out value="<%= ObjectType.analogValue.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.analogValue"/></option>
-        <option value="<c:out value="<%= ObjectType.averaging.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.averaging"/></option>
-        <option value="<c:out value="<%= ObjectType.binaryInput.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.binaryInput"/></option>
-        <option value="<c:out value="<%= ObjectType.binaryOutput.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.binaryOutput"/></option>
-        <option value="<c:out value="<%= ObjectType.binaryValue.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.binaryValue"/></option>
-        <option value="<c:out value="<%= ObjectType.lifeSafetyPoint.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.lifeSafetyPoint"/></option>
-        <option value="<c:out value="<%= ObjectType.lifeSafetyZone.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.lifeSafetyZone"/></option>
-        <option value="<c:out value="<%= ObjectType.loop.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.loop"/></option>
-        <option value="<c:out value="<%= ObjectType.multiStateInput.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.multiStateInput"/></option>
-        <option value="<c:out value="<%= ObjectType.multiStateOutput.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.multiStateOutput"/></option>
-        <option value="<c:out value="<%= ObjectType.multiStateValue.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.multiStateValue"/></option>
-        <option value="<c:out value="<%= ObjectType.pulseConverter.intValue() %>"/>"><fmt:message key="dsEdit.bacnetIp.objectType.pulseConverter"/></option>
+        <option value="<c:out value="<%= ObjectType.accessDoor.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.accessDoor"/></option>
+        <option value="<c:out value="<%= ObjectType.accumulator.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.accumulator"/></option>
+        <option value="<c:out value="<%= ObjectType.analogInput.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.analogInput"/></option>
+        <option value="<c:out value="<%= ObjectType.analogOutput.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.analogOutput"/></option>
+        <option value="<c:out value="<%= ObjectType.analogValue.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.analogValue"/></option>
+        <option value="<c:out value="<%= ObjectType.averaging.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.averaging"/></option>
+        <option value="<c:out value="<%= ObjectType.binaryInput.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.binaryInput"/></option>
+        <option value="<c:out value="<%= ObjectType.binaryOutput.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.binaryOutput"/></option>
+        <option value="<c:out value="<%= ObjectType.binaryValue.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.binaryValue"/></option>
+        <option value="<c:out value="<%= ObjectType.lifeSafetyPoint.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.lifeSafetyPoint"/></option>
+        <option value="<c:out value="<%= ObjectType.lifeSafetyZone.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.lifeSafetyZone"/></option>
+        <option value="<c:out value="<%= ObjectType.loop.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.loop"/></option>
+        <option value="<c:out value="<%= ObjectType.multiStateInput.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.multiStateInput"/></option>
+        <option value="<c:out value="<%= ObjectType.multiStateOutput.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.multiStateOutput"/></option>
+        <option value="<c:out value="<%= ObjectType.multiStateValue.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.multiStateValue"/></option>
+        <option value="<c:out value="<%= ObjectType.pulseConverter.intValue() %>"/>"><spring:message code="dsEdit.bacnetIp.objectType.pulseConverter"/></option>
       </select>
     </td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.objectInstanceNumber"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.objectInstanceNumber"/></td>
     <td class="formField"><input type="text" id="objectInstanceNumber"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.useCov"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.useCov"/></td>
     <td class="formField"><input type="checkbox" id="useCovSubscription"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.settable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.settable"/></td>
     <td class="formField"><input type="checkbox" id="settable" onclick="settableChanged()"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.bacnetIp.writePriority"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.bacnetIp.writePriority"/></td>
     <td class="formField"><input type="text" id="writePriority"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select name="dataTypeId">
         <tag:dataTypeOptions excludeImage="true"/>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3.jsp
index 336fc1aa35..f0970c5848 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3.jsp
@@ -21,7 +21,7 @@
 
 <script type="text/javascript">
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.dnp3.index"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.dnp3.index"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.index; };
   }
   
@@ -99,15 +99,15 @@
 			  index[i] = parseInt($get("minIndex")) + i;
 			  locators[i] = locator;
 			  if ($get("datatype") == 00) {
-					names[i] = ("<fmt:message key="dsEdit.dnp3.binaryInput"/>" + " " + (parseInt($get("minIndex")) + i));
+					names[i] = ("<spring:message code="dsEdit.dnp3.binaryInput"/>" + " " + (parseInt($get("minIndex")) + i));
 			 }  else if ($get("datatype") == 0x10) {
-					names[i] = ("<fmt:message key="dsEdit.dnp3.binaryOutput"/>" + " " + (parseInt($get("minIndex")) + i));
+					names[i] = ("<spring:message code="dsEdit.dnp3.binaryOutput"/>" + " " + (parseInt($get("minIndex")) + i));
 			 }  else if ($get("datatype") == 0x30) {
-					names[i] = ("<fmt:message key="dsEdit.dnp3.analogInput"/>" + " " + (parseInt($get("minIndex")) + i));
+					names[i] = ("<spring:message code="dsEdit.dnp3.analogInput"/>" + " " + (parseInt($get("minIndex")) + i));
 			 }  else if ($get("datatype") == 0x50) {
-					names[i] = ("<fmt:message key="dsEdit.dnp3.analogOutput"/>" + " " + (parseInt($get("minIndex")) + i));
+					names[i] = ("<spring:message code="dsEdit.dnp3.analogOutput"/>" + " " + (parseInt($get("minIndex")) + i));
 			 }  else if ($get("datatype") == 0x20) {
-					names[i] = ("<fmt:message key="dsEdit.dnp3.runningCounter"/>" + " " + (parseInt($get("minIndex")) + i));
+					names[i] = ("<spring:message code="dsEdit.dnp3.runningCounter"/>" + " " + (parseInt($get("minIndex")) + i));
 			 }
 		  }
 		  DataSourceEditDwr.saveMultipleDnp3PointLocator(names, index, locators, savePointCB);
@@ -137,13 +137,13 @@
       var theValue = $get(prefix);
       var theNumber = parseInt(theValue);
       if (isNaN(theNumber)) {
-          alert("<fmt:message key="dsEdit.virtual.errorParsingValue"/>");
+          alert("<spring:message code="dsEdit.virtual.errorParsingValue"/>");
           return false;
       }
       var arr = currentPoint.pointLocator[prefix +"Change"].values;
       for (var i=arr.length-1; i>=0; i--) {
           if (arr[i] == theNumber) {
-              alert("<fmt:message key="dsEdit.virtual.invalidValue"/> "+ theNumber);
+              alert("<spring:message code="dsEdit.virtual.invalidValue"/> "+ theNumber);
               return false;
           }
       }
@@ -169,7 +169,7 @@
       dwr.util.addRows(prefix +"Values", arr, [
               function(data) { return data; },
               function(data) {
-                  return writeImage(null, null, "bullet_delete", "<fmt:message key="common.delete"/>",
+                  return writeImage(null, null, "bullet_delete", "<spring:message code="common.delete"/>",
                           "removeListValue("+ data +", '"+ prefix +"');");
               }
               ]);
@@ -183,22 +183,22 @@
 
 <c:choose>
   <c:when test="${dataSource.type.id == applicationScope['constants.DataSourceVO.Types.DNP3_SERIAL']}">
-    <c:set var="dsDesc"><fmt:message key="dsEdit.dnp3.descSerial"/></c:set>
+    <c:set var="dsDesc"><spring:message code="dsEdit.dnp3.descSerial"/></c:set>
     <c:set var="dsHelpId" value="dnp3DS"/>
   </c:when>
   <c:when test="${dataSource.type.id == applicationScope['constants.DataSourceVO.Types.DNP3_IP']}">
-    <c:set var="dsDesc"><fmt:message key="dsEdit.dnp3.descIp"/></c:set>
+    <c:set var="dsDesc"><spring:message code="dsEdit.dnp3.descIp"/></c:set>
     <c:set var="dsHelpId" value="dnp3DS"/>
   </c:when>
 </c:choose>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.sourceAddress"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.sourceAddress"/></td>
     <td class="formField"><input id="sourceAddress" type="text" value="${dataSource.sourceAddress}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.slaveAddress"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.slaveAddress"/></td>
     <td class="formField"><input id="slaveAddress" type="text" value="${dataSource.slaveAddress}"/></td>
   </tr>
   <c:choose>
@@ -210,20 +210,20 @@
     </c:when>
   </c:choose>
   <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.quantize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.quantize"/></td>
           <td class="formField"><sst:checkbox id="quantize" selectedValue="${dataSource.quantize}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.retries"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.retries"/></td>
     <td class="formField"><input type="text" id="retries" value="${dataSource.retries}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.timeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.timeout"/></td>
     <td class="formField"><input type="text" id="timeout" value="${dataSource.timeout}"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.rbePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.rbePeriod"/></td>
     <td class="formField">
       <input type="text" id="rbePollPeriods" value="${dataSource.rbePollPeriods}" class="formShort" />
       <sst:select id="rbePeriodType" value="${dataSource.rbePeriodType}">
@@ -232,7 +232,7 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.staticPeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.staticPeriod"/></td>
     <td class="formField">
       <input type="text" id="staticPollPeriods" value="${dataSource.staticPollPeriods}" class="formShort" />
     </td>
@@ -242,23 +242,23 @@
 
 <tag:pointList pointHelpId="dnp3PP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.addMany"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.addMany"/></td>
     <td class="formField"><input type="checkbox" id="addMany" onchange="changeAddMany();"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.minIndex"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.minIndex"/></td>
     <td class="formField"><input id="minIndex" disabled="disabled" type="text" value=""/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.maxIndex"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.maxIndex"/></td>
     <td class="formField"><input id="maxIndex" disabled="disabled" type="text" value=""/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.index"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.index"/></td>
     <td class="formField"><input id="index" type="text" value="0"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.dataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.dataType"/></td>
     <td class="formField">
       <select id="datatype" onchange="changeDataType();">
         <option value="<c:out value="<%= Dnp3PointLocatorVO.BINARY_INPUT %>"/>">BINARY INPUT</option>
@@ -271,7 +271,7 @@
   </tr>
   <tbody id="divWrittable" style="display: none;">
    <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.operateMode"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.operateMode"/></td>
     <td class="formField">
       <select id="operateMode">
         <!--<option value="<c:out value="<%= Dnp3PointLocatorVO.SBO %>"/>">Select Before Operate</option>-->
@@ -283,7 +283,7 @@
   </tbody>
   <tbody id="divBinWrittable" style="display: none;">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.controlCommand"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.controlCommand"/></td>
     <td class="formField">
       <select id="controlCommand">
         <option value="<c:out value="<%= Dnp3PointLocatorVO.CLOSE_TRIP %>"/>">Close/Trip</option>
@@ -293,11 +293,11 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.timeOn"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.timeOn"/></td>
     <td class="formField"><input id="timeOn" type="text" value="0"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3.timeOff"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.dnp3.timeOff"/></td>
     <td class="formField"><input id="timeOff" type="text" value="0"/></td>
   </tr>
   </tbody>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3Ip.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3Ip.jsp
index 621dc3a5b4..260a076e68 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3Ip.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3Ip.jsp
@@ -30,11 +30,11 @@ function saveDataSourceImpl() {
 </script>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3Ip.host"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.dnp3Ip.host"/></td>
   <td class="formField"><input id="host" type="text" value="${dataSource.host}"/></td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3Ip.port"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.dnp3Ip.port"/></td>
   <td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
 </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3Serial.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3Serial.jsp
index e0bbe71a23..20d6559c66 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3Serial.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editDnp3Serial.jsp
@@ -37,8 +37,8 @@
 </script>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.dnp3Serial.commPortId" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.dnp3Serial.commPortId" /></td>
 	<td class="formField"><c:choose>
 		<c:when test="${!empty commPortError}">
 			<input id="commPortId" type="hidden" value="" />
@@ -55,8 +55,8 @@
 </tr>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.dnp3Serial.baud" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.dnp3Serial.baud" /></td>
 	<td class="formField"><sst:select id="baudRate"
 		value="${dataSource.baudRate}">
 		<sst:option>110</sst:option>
@@ -76,7 +76,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3Serial.dataBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.dnp3Serial.dataBits"/></td>
   <td class="formField">
     <sst:select id="dataBits" value="${dataSource.dataBits}">
       <sst:option value="5">5</sst:option>
@@ -88,7 +88,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3Serial.stopBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.dnp3Serial.stopBits"/></td>
   <td class="formField">
     <sst:select id="stopBits" value="${dataSource.stopBits}">
       <sst:option value="1">1</sst:option>
@@ -99,14 +99,14 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3Serial.parity"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.dnp3Serial.parity"/></td>
   <td class="formField">
     <sst:select id="parity" value="${dataSource.parity}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.parity.none"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.modbusSerial.parity.odd"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.modbusSerial.parity.even"/></sst:option>
-      <sst:option value="3"><fmt:message key="dsEdit.modbusSerial.parity.mark"/></sst:option>
-      <sst:option value="4"><fmt:message key="dsEdit.modbusSerial.parity.space"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.parity.none"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.modbusSerial.parity.odd"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.modbusSerial.parity.even"/></sst:option>
+      <sst:option value="3"><spring:message code="dsEdit.modbusSerial.parity.mark"/></sst:option>
+      <sst:option value="4"><spring:message code="dsEdit.modbusSerial.parity.space"/></sst:option>
     </sst:select>
   </td>
 </tr>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editDrStorageHt5b.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editDrStorageHt5b.jsp
index cbbd928e7d..d557df2816 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editDrStorageHt5b.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editDrStorageHt5b.jsp
@@ -72,13 +72,13 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.drStorageHt5b.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.drStorageHt5b.desc"/></c:set>
 <c:set var="dsHelpId" value="drStorageHt5bDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.asciiSerial.commPortId" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.asciiSerial.commPortId" /></td>
 	<td class="formField"><c:choose>
 		<c:when test="${!empty commPortError}">
 			<input id="commPortId" type="hidden" value="" />
@@ -95,8 +95,8 @@
 </tr>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.asciiSerial.baud" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.asciiSerial.baud" /></td>
 	<td class="formField"><sst:select id="baudRate"
 		value="${dataSource.baudRate}">
 		<sst:option>110</sst:option>
@@ -116,7 +116,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.dataBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.dataBits"/></td>
   <td class="formField">
     <sst:select id="dataBits" value="${dataSource.dataBits}">
       <sst:option value="5">5</sst:option>
@@ -128,7 +128,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.stopBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.stopBits"/></td>
   <td class="formField">
     <sst:select id="stopBits" value="${dataSource.stopBits}">
       <sst:option value="1">1</sst:option>
@@ -139,20 +139,20 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.parity"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.parity"/></td>
   <td class="formField">
     <sst:select id="parity" value="${dataSource.parity}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.parity.none"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.modbusSerial.parity.odd"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.modbusSerial.parity.even"/></sst:option>
-      <sst:option value="3"><fmt:message key="dsEdit.modbusSerial.parity.mark"/></sst:option>
-      <sst:option value="4"><fmt:message key="dsEdit.modbusSerial.parity.space"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.parity.none"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.modbusSerial.parity.odd"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.modbusSerial.parity.even"/></sst:option>
+      <sst:option value="3"><spring:message code="dsEdit.modbusSerial.parity.mark"/></sst:option>
+      <sst:option value="4"><spring:message code="dsEdit.modbusSerial.parity.space"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -162,21 +162,21 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.retries"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.retries"/></td>
     <td class="formField"><input type="text" id="retries" value="${dataSource.retries}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.timeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.timeout"/></td>
     <td class="formField"><input type="text" id="timeout" value="${dataSource.timeout}"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.quantize"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.quantize"/></td>
     <td class="formField"><sst:checkbox id="quantize" selectedValue="${dataSource.quantize}"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiSerial.initString"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiSerial.initString"/></td>
     <td class="formField">
     	<input id="initString" type="text" value=""/>
     </td>
@@ -187,12 +187,12 @@
 <tag:pointList pointHelpId="drStorageHt5bPP">
 
 	 <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.drStorageHt5b.pointType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.drStorageHt5b.pointType"/></td>
     <td class="formField">
     	<sst:select id="pointType"
 			value="${dataPoint.pointType}">
-			<sst:option value="Temperature" ><fmt:message key="dsEdit.drStorageHt5b.type.Temperature"/></sst:option>
-			<sst:option value="Humidity" ><fmt:message key="dsEdit.drStorageHt5b.type.Humidity"/></sst:option>
+			<sst:option value="Temperature" ><spring:message code="dsEdit.drStorageHt5b.type.Temperature"/></sst:option>
+			<sst:option value="Humidity" ><spring:message code="dsEdit.drStorageHt5b.type.Humidity"/></sst:option>
 		</sst:select>
     </td>
   </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editEBI25.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editEBI25.jsp
index b4a6445a4d..60116b1d99 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editEBI25.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editEBI25.jsp
@@ -28,7 +28,7 @@
   function readInterface() {
       disableButtons(true);
       cancelEditPoint();
-      $set("readInterfaceMessage", "<fmt:message key="dsEdit.ebi25.startRead"/>");
+      $set("readInterfaceMessage", "<spring:message code="dsEdit.ebi25.startRead"/>");
       DataSourceEditDwr.ebi25ReadInterface($get("host"), $get("port"), $get("keepAlive"), $get("timeout"),
               $get("retries"), function(reader) {
           disableButtons(false);
@@ -51,13 +51,13 @@
   
   function syncTime() {
       disableButtons(true);
-      $set("readInterfaceMessage", "<fmt:message key="dsEdit.ebi25.syncing"/>");
+      $set("readInterfaceMessage", "<spring:message code="dsEdit.ebi25.syncing"/>");
       DataSourceEditDwr.ebi25SyncTime($get("host"), $get("port"), $get("timeout"), $get("retries"), function(result) {
           disableButtons(false);
           if (result)
               $set("readInterfaceMessage", result);
           else
-              $set("readInterfaceMessage", "<fmt:message key="dsEdit.ebi25.synced"/>");
+              $set("readInterfaceMessage", "<spring:message code="dsEdit.ebi25.synced"/>");
       });
   }
   
@@ -73,10 +73,10 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.ebi25.unit"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.ebi25.unit"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.configurationDescription; };
       
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.ebi25.serialNumber"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.ebi25.serialNumber"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.serialNumber; };
   }
   
@@ -116,26 +116,26 @@
 </script>
 
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.ebi25.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.ebi25.desc"/></c:set>
 <c:set var="dsHelpId" value="ebi25DS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.ebi25.host"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.ebi25.host"/></td>
           <td class="formField"><input id="host" type="text" value="${dataSource.host}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.ebi25.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.ebi25.port"/></td>
           <td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.ebi25.keepAlive"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.ebi25.keepAlive"/></td>
           <td class="formField"><sst:checkbox id="keepAlive" value="${dataSource.keepAlive}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -145,34 +145,34 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.ebi25.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.ebi25.timeout"/></td>
           <td class="formField"><input type="text" id="timeout" value="${dataSource.timeout}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.ebi25.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.ebi25.retries"/></td>
           <td class="formField"><input type="text" id="retries" value="${dataSource.retries}"/></td>
         </tr>
         
         <tr><td class="horzSeparator" colspan="2"></td></tr>
         
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.ebi25.serialNumber"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.ebi25.serialNumber"/></td>
           <td class="formField" id="serialNumber">${dataSource.serialNumber}</td>
         </tr>
         
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.ebi25.productionDate"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.ebi25.productionDate"/></td>
           <td class="formField" id="productionDate">${dataSource.productionDate}</td>
         </tr>
         
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.ebi25.hardwareVersion"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.ebi25.hardwareVersion"/></td>
           <td class="formField" id="hardwareVersion">${dataSource.hardwareVersion}</td>
         </tr>
         
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.ebi25.firmwareVersion"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.ebi25.firmwareVersion"/></td>
           <td class="formField" id="firmwareVersion">${dataSource.firmwareVersion}</td>
         </tr>
         
@@ -185,12 +185,12 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.ebi25.ebi25Interface"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.ebi25.ebi25Interface"/></td></tr>
         
         <tr>
           <td colspan="2" align="center">
-            <input id="readInterfaceBtn" type="button" value="<fmt:message key="dsEdit.ebi25.readInterface"/>" onclick="readInterface();"/>
-            <input id="syncTimeBtn" type="button" value="<fmt:message key="dsEdit.ebi25.syncTime"/>" onclick="syncTime();"/>
+            <input id="readInterfaceBtn" type="button" value="<spring:message code="dsEdit.ebi25.readInterface"/>" onclick="readInterface();"/>
+            <input id="syncTimeBtn" type="button" value="<spring:message code="dsEdit.ebi25.syncTime"/>" onclick="syncTime();"/>
           </td>
         </tr>
         
@@ -199,58 +199,58 @@
 
 <tag:pointList pointHelpId="ebi25PP">
   <tr>
-    <td class="formLabel"><fmt:message key="dsEdit.ebi25.index"/></td>
+    <td class="formLabel"><spring:message code="dsEdit.ebi25.index"/></td>
     <td class="formField" id="index"></td>
   </tr>
   
   <tr>
-    <td class="formLabel"><fmt:message key="dsEdit.ebi25.type"/></td>
+    <td class="formLabel"><spring:message code="dsEdit.ebi25.type"/></td>
     <td class="formField" id="type"></td>
   </tr>
   
   <tr>
-    <td class="formLabel"><fmt:message key="dsEdit.ebi25.serialNumber"/></td>
+    <td class="formLabel"><spring:message code="dsEdit.ebi25.serialNumber"/></td>
     <td class="formField" id="serialNumberPoint"></td>
   </tr>
   
   <tr>
-    <td class="formLabel"><fmt:message key="dsEdit.ebi25.productionDate"/></td>
+    <td class="formLabel"><spring:message code="dsEdit.ebi25.productionDate"/></td>
     <td class="formField" id="productionDatePoint"></td>
   </tr>
   
   <tr>
-    <td class="formLabel"><fmt:message key="dsEdit.ebi25.calibrationDate"/></td>
+    <td class="formLabel"><spring:message code="dsEdit.ebi25.calibrationDate"/></td>
     <td class="formField" id="calibrationDatePoint"></td>
   </tr>
   
   <tr>
-    <td class="formLabel"><fmt:message key="dsEdit.ebi25.hardwareVersion"/></td>
+    <td class="formLabel"><spring:message code="dsEdit.ebi25.hardwareVersion"/></td>
     <td class="formField" id="hardwareVersionPoint"></td>
   </tr>
   
   <tr>
-    <td class="formLabel"><fmt:message key="dsEdit.ebi25.firmwareVersion"/></td>
+    <td class="formLabel"><spring:message code="dsEdit.ebi25.firmwareVersion"/></td>
     <td class="formField" id="firmwareVersionPoint"></td>
   </tr>
   
   <tbody id="valuePointDetails">
     <tr>
-      <td class="formLabel"><fmt:message key="dsEdit.ebi25.unit"/></td>
+      <td class="formLabel"><spring:message code="dsEdit.ebi25.unit"/></td>
       <td class="formField" id="unit"></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.ebi25.sampleRate"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.ebi25.sampleRate"/></td>
       <td class="formField"><input type="text" id="sampleRate"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.ebi25.lowLimit"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.ebi25.lowLimit"/></td>
       <td class="formField"><input type="text" id="lowLimit"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.ebi25.highLimit"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.ebi25.highLimit"/></td>
       <td class="formField"><input type="text" id="highLimit"/></td>
     </tr>
   </tbody>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editFhz4J.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editFhz4J.jsp
index ebcebae073..9fe286e5f2 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editFhz4J.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editFhz4J.jsp
@@ -40,7 +40,7 @@
                 function(propertyLabel) { return propertyLabel; },
                 function(propertyLabel) {
                     return writeImage("scanDeviceImg_"+ $get(deviceHousecode) + "_" +  $get(deviceType) + "_" + propertyLabel, null, "icon_comp_add",
-                         "<fmt:message key="common.add"/>", "addPoint({'deviceHousecode': '" + $get(deviceHousecode) + "', 'deviceLocation': '" + $get(deviceLocation) + "', 'deviceType': '" + $get(deviceType) + "', 'propertyLabel': '"+ propertyLabel + "'})");
+                         "<spring:message code="common.add"/>", "addPoint({'deviceHousecode': '" + $get(deviceHousecode) + "', 'deviceLocation': '" + $get(deviceLocation) + "', 'deviceType': '" + $get(deviceType) + "', 'propertyLabel': '"+ propertyLabel + "'})");
            }
             ],
             {
@@ -59,16 +59,16 @@
     }
 
     function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.fhz4j.deviceHousecode'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.fhz4j.deviceHousecode'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.deviceHousecodeStr; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.fhz4j.deviceType'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.fhz4j.deviceType'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.fhzDeviceTypeLabel; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.fhz4j.deviceProperty'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.fhz4j.deviceProperty'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.fhzPropertyLabel; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.fhz4j.PropertySettable'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.fhz4j.PropertySettable'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.settable; };
     }
 
@@ -103,12 +103,12 @@
 
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.fhz4j.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.fhz4j.desc"/></c:set>
 <c:set var="dsHelpId" value="fhz4jDS"/>
 <%@include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 
 <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serial.port"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serial.port"/></td>
     <td class="formField">
         <c:choose>
             <c:when test="${!empty commPortError}">
@@ -131,7 +131,7 @@
 </tr>
 
 <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.fhz4j.fhzHouseCode"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.fhz4j.fhzHouseCode"/></td>
     <td class="formField">
         <input type="text" id="fhzHousecode" value="${dataSource.fhzHousecodeStr}" class="formShort"/>
     </td>
@@ -139,7 +139,7 @@
 
 <tr>
     <td colspan="2" />
-<input type="checkbox" id="fhzMaster" <c:if test="${dataSource.fhzMaster}"> checked="checked"</c:if> class="formShort" ><fmt:message key="dsEdit.fhz4j.fhzMaster"/></input>
+<input type="checkbox" id="fhzMaster" <c:if test="${dataSource.fhzMaster}"> checked="checked"</c:if> class="formShort" ><spring:message code="dsEdit.fhz4j.fhzMaster"/></input>
 </td>
 </tr>
 
@@ -151,13 +151,13 @@
 <td valign="top">
     <div class="borderDiv marB">
         <table>
-            <tr><td colspan="3" class="smallTitle"><fmt:message key="dsEdit.fhz4j.init"/></td></tr>
+            <tr><td colspan="3" class="smallTitle"><spring:message code="dsEdit.fhz4j.init"/></td></tr>
             <tr>
-                <td class="formLabelRequired"><fmt:message key="dsEdit.fhz4j.deviceHousecode"/></td>
+                <td class="formLabelRequired"><spring:message code="dsEdit.fhz4j.deviceHousecode"/></td>
                 <td class="formField">
                     <input type="text" id="deviceHousecode" class="formShort"/>
                 </td>
-                <td class="formLabelRequired"><fmt:message key="dsEdit.fhz4j.deviceLocation"/></td>
+                <td class="formLabelRequired"><spring:message code="dsEdit.fhz4j.deviceLocation"/></td>
                 <td class="formField">
                     <input type="text" id="deviceLocation" class="formShort"/>
                 </td>
@@ -169,7 +169,7 @@
                     </sst:select>
                 </td>
                 <td>
-                    <input id="showDevicePropsBtn" type="button" value="<fmt:message key="dsEdit.fhz4j.showDevicePropsBtn"/>" onclick="assembleDevice()"/>
+                    <input id="showDevicePropsBtn" type="button" value="<spring:message code="dsEdit.fhz4j.showDevicePropsBtn"/>" onclick="assembleDevice()"/>
                 </td>
             </tr>
 
@@ -179,11 +179,11 @@
                 <td colspan="2">
                     <table cellspacing="1">
                         <tr class="rowHeader">
-                            <td><fmt:message key="dsEdit.fhz4j.deviceHousecode"/></td>
-                            <td><fmt:message key="dsEdit.fhz4j.deviceLocation"/></td>
-                            <td><fmt:message key="dsEdit.fhz4j.deviceType"/></td>
-                            <td><fmt:message key="dsEdit.fhz4j.property"/></td>
-                            <td><fmt:message key="dsEdit.fhz4j.add"/></td>
+                            <td><spring:message code="dsEdit.fhz4j.deviceHousecode"/></td>
+                            <td><spring:message code="dsEdit.fhz4j.deviceLocation"/></td>
+                            <td><spring:message code="dsEdit.fhz4j.deviceType"/></td>
+                            <td><spring:message code="dsEdit.fhz4j.property"/></td>
+                            <td><spring:message code="dsEdit.fhz4j.add"/></td>
                         </tr>
                         <tbody id="fhz4jValues"></tbody>
                     </table>
@@ -198,19 +198,19 @@
 
                 <tbody id="readonlyAttributes">
                     <tr>
-                        <td class="formLabelRequired"><fmt:message key="dsEdit.fhz4j.deviceHousecode"/></td>
+                        <td class="formLabelRequired"><spring:message code="dsEdit.fhz4j.deviceHousecode"/></td>
                         <td class="formField"><input id="editDeviceHousecode" disabled="disabled"/></td>
                     </tr>
                     <tr>
-                        <td class="formLabelRequired"><fmt:message key="dsEdit.fhz4j.deviceType"/></td>
+                        <td class="formLabelRequired"><spring:message code="dsEdit.fhz4j.deviceType"/></td>
                         <td class="formField"><input id="editDeviceTypeLabel" disabled="disabled"/></td>
                     </tr>
                     <tr>
-                        <td class="formLabelRequired"><fmt:message key="dsEdit.fhz4j.property"/></td>
+                        <td class="formLabelRequired"><spring:message code="dsEdit.fhz4j.property"/></td>
                         <td class="formField"><input id="editFhzPropertyLabel" disabled="disabled"/></td>
                     </tr>
                     <tr>
-                        <td class="formLabelRequired"><fmt:message key="dsEdit.openv4j.dataPointSettable"/></td>
+                        <td class="formLabelRequired"><spring:message code="dsEdit.openv4j.dataPointSettable"/></td>
                         <td class="formField"><input type="checkbox" id="editDataPointSettable" disabled="disabled"/></td>
                     </tr>
                 </tbody>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editGalil.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editGalil.jsp
index e250bc8009..b27eb28e2b 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editGalil.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editGalil.jsp
@@ -49,7 +49,7 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.galil.type"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.galil.type"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
               function(p) { return p.pointLocator.configurationDescription; };
   }
@@ -139,31 +139,31 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.galil.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.galil.desc"/></c:set>
 <c:set var="dsHelpId" value="galilDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.galil.host"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.galil.host"/></td>
           <td class="formField"><input id="host" type="text" value="${dataSource.host}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.galil.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.galil.port"/></td>
           <td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.galil.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.galil.timeout"/></td>
           <td class="formField"><input id="timeout" type="text" value="${dataSource.timeout}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.galil.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.galil.retries"/></td>
           <td class="formField"><input id="retries" type="text" value="${dataSource.retries}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -179,16 +179,16 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.galil.commandTesting"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.galil.commandTesting"/></td></tr>
         
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.galil.command"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.galil.command"/></td>
           <td class="formField"><input type="text" id="galilTestCommand"/></td>
         </tr>
         
         <tr>
           <td colspan="2" align="center">
-            <input id="galilTestBtn" type="button" value="<fmt:message key="dsEdit.galil.execute"/>" onclick="galilTest();"/>
+            <input id="galilTestBtn" type="button" value="<spring:message code="dsEdit.galil.execute"/>" onclick="galilTest();"/>
           </td>
         </tr>
         
@@ -197,14 +197,14 @@
 
 <tag:pointList pointHelpId="galilPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.galil.pointType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.galil.pointType"/></td>
     <td class="formField">
       <select id="pointTypeId" onchange="changePointType();">
-        <option value="<c:out value="<%= PointTypeVO.Types.COMMAND %>"/>"><fmt:message key="dsEdit.galil.pointType.command"/></option>
-        <option value="<c:out value="<%= PointTypeVO.Types.INPUT %>"/>"><fmt:message key="dsEdit.galil.pointType.input"/></option>
-        <option value="<c:out value="<%= PointTypeVO.Types.OUTPUT %>"/>"><fmt:message key="dsEdit.galil.pointType.output"/></option>
-        <option value="<c:out value="<%= PointTypeVO.Types.TELL_POSITION %>"/>"><fmt:message key="dsEdit.galil.pointType.tellPosition"/></option>
-        <option value="<c:out value="<%= PointTypeVO.Types.VARIABLE %>"/>"><fmt:message key="dsEdit.galil.pointType.variable"/></option>
+        <option value="<c:out value="<%= PointTypeVO.Types.COMMAND %>"/>"><spring:message code="dsEdit.galil.pointType.command"/></option>
+        <option value="<c:out value="<%= PointTypeVO.Types.INPUT %>"/>"><spring:message code="dsEdit.galil.pointType.input"/></option>
+        <option value="<c:out value="<%= PointTypeVO.Types.OUTPUT %>"/>"><spring:message code="dsEdit.galil.pointType.output"/></option>
+        <option value="<c:out value="<%= PointTypeVO.Types.TELL_POSITION %>"/>"><spring:message code="dsEdit.galil.pointType.tellPosition"/></option>
+        <option value="<c:out value="<%= PointTypeVO.Types.VARIABLE %>"/>"><spring:message code="dsEdit.galil.pointType.variable"/></option>
       </select>
     </td>
   </tr>
@@ -220,7 +220,7 @@
   --%>
   <tbody id="divPH2" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
       <td class="formField">
         <select id="inputPointType.dataTypeId" onchange="changeInputDataType();">
           <tag:dataTypeOptions excludeAlphanumeric="true" excludeImage="true" excludeMultistate="true"/>
@@ -229,27 +229,27 @@
     </tr>
   
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.inputNumber"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.inputNumber"/></td>
       <td class="formField"><input type="text" id="inputPointType.inputId" /></td>
     </tr>
 
     <tr id="inputScaleRawLow">
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.scaleLow"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.scaleLow"/></td>
       <td class="formField"><input type="text" id="inputPointType.scaleRawLow" /></td>
     </tr>
 
     <tr id="inputScaleRawHigh">
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.scaleHigh"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.scaleHigh"/></td>
       <td class="formField"><input type="text" id="inputPointType.scaleRawHigh" /></td>
     </tr>
 
     <tr id="inputScaleEngLow">
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.engLow"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.engLow"/></td>
       <td class="formField"><input type="text" id="inputPointType.scaleEngLow" /></td>
     </tr>
 
     <tr id="inputScaleEngHigh">
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.engHigh"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.engHigh"/></td>
       <td class="formField"><input type="text" id="inputPointType.scaleEngHigh" /></td>
     </tr>
   </tbody>
@@ -259,7 +259,7 @@
   --%>
   <tbody id="divPH3" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.outputNumber"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.outputNumber"/></td>
       <td class="formField"><input type="text" id="outputPointType.outputId" /></td>
     </tr>
   </tbody>
@@ -269,7 +269,7 @@
   --%>
   <tbody id="divPH4" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.axis"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.axis"/></td>
       <td class="formField">
         <select id="tellPositionPointType.axis">
           <option>A</option>
@@ -285,27 +285,27 @@
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.scaleLow"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.scaleLow"/></td>
       <td class="formField"><input type="text" id="tellPositionPointType.scaleRawLow" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.scaleHigh"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.scaleHigh"/></td>
       <td class="formField"><input type="text" id="tellPositionPointType.scaleRawHigh" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.engLow"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.engLow"/></td>
       <td class="formField"><input type="text" id="tellPositionPointType.scaleEngLow" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.engHigh"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.engHigh"/></td>
       <td class="formField"><input type="text" id="tellPositionPointType.scaleEngHigh" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.round"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.round"/></td>
       <td class="formField"><input type="checkbox" id="tellPositionPointType.roundToInteger"></td>
     </tr>
   </tbody>
@@ -315,12 +315,12 @@
   --%>
   <tbody id="divPH5" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.galil.varName"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.galil.varName"/></td>
       <td class="formField"><input type="text" id="variablePointType.variableName" /></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
       <td class="formField">
         <select id="variablePointType.dataTypeId">
           <tag:dataTypeOptions excludeImage="true"/>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpImage.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpImage.jsp
index 4fd45ab826..144a29c8ed 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpImage.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpImage.jsp
@@ -76,11 +76,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.httpImage.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.httpImage.desc"/></c:set>
 <c:set var="dsHelpId" value="httpImageDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -92,7 +92,7 @@
 
 <tag:pointList pointHelpId="httpImagePP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.url"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.url"/></td>
     <td class="formField">
       <input id="url" type="text" class="formLong"/>
       <tag:img png="bullet_go" onclick="window.open($get('url'), 'httpImageTarget')" title="dsEdit.httpImage.openUrl"/>
@@ -100,54 +100,54 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.timeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.timeout"/></td>
     <td class="formField"><input id="timeoutSeconds" type="text"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.retries"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.retries"/></td>
     <td class="formField"><input id="retries" type="text"/></td>
   </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.scalingType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.scalingType"/></td>
     <td class="formField">
       <select id="scaleType" onchange="scaleTypeChanged()">
-        <option value="<c:out value="<%= HttpImagePointLocatorVO.SCALE_TYPE_NONE %>"/>"><fmt:message key="dsEdit.httpImage.scalingType.none"/></option>
-        <option value="<c:out value="<%= HttpImagePointLocatorVO.SCALE_TYPE_PERCENT %>"/>"><fmt:message key="dsEdit.httpImage.scalingType.percent"/></option>
-        <option value="<c:out value="<%= HttpImagePointLocatorVO.SCALE_TYPE_BOX %>"/>"><fmt:message key="dsEdit.httpImage.scalingType.box"/></option>
+        <option value="<c:out value="<%= HttpImagePointLocatorVO.SCALE_TYPE_NONE %>"/>"><spring:message code="dsEdit.httpImage.scalingType.none"/></option>
+        <option value="<c:out value="<%= HttpImagePointLocatorVO.SCALE_TYPE_PERCENT %>"/>"><spring:message code="dsEdit.httpImage.scalingType.percent"/></option>
+        <option value="<c:out value="<%= HttpImagePointLocatorVO.SCALE_TYPE_BOX %>"/>"><spring:message code="dsEdit.httpImage.scalingType.box"/></option>
       </select>
     </td>
   </tr>
   
   <tbody id="scalePercentRow">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.scalePercent"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.scalePercent"/></td>
       <td class="formField"><input id="scalePercent" type="text"/></td>
     </tr>
   </tbody>
   
   <tbody id="scaleWidthRow">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.scaleWidth"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.scaleWidth"/></td>
       <td class="formField"><input id="scaleWidth" type="text"/></td>
     </tr>
   </tbody>
   
   <tbody id="scaleHeightRow">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.scaleHeight"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.scaleHeight"/></td>
       <td class="formField"><input id="scaleHeight" type="text"/></td>
     </tr>
   </tbody>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.readLimit"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.readLimit"/></td>
     <td class="formField"><input id="readLimit" type="text"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpImage.liveFeed"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpImage.liveFeed"/></td>
     <td class="formField"><textarea id="webcamLiveFeedCode" rows="10" cols="37"></textarea></td>
   </tr>
 </tag:pointList>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpReceiver.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpReceiver.jsp
index 0a4a583bc8..1211019320 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpReceiver.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpReceiver.jsp
@@ -42,7 +42,7 @@
       
       for (var i=0; i<ipWhiteList.length; i++) {
           if (ipWhiteList[i] == ipMask) {
-              alert("<fmt:message key="dsEdit.httpReceiver.containsIpMask"/> "+ ipMask);
+              alert("<spring:message code="dsEdit.httpReceiver.containsIpMask"/> "+ ipMask);
               return;
           }
       }
@@ -63,7 +63,7 @@
       
       for (var i=0; i<deviceIdWhiteList.length; i++) {
           if (deviceIdWhiteList[i] == deviceIdMask) {
-              alert("<fmt:message key="dsEdit.httpReceiver.containsDeviceMask"/> "+ deviceIdMask);
+              alert("<spring:message code="dsEdit.httpReceiver.containsDeviceMask"/> "+ deviceIdMask);
               return;
           }
       }
@@ -99,7 +99,7 @@
                   function(data) { return ""; },
                   function(data) {
                       return data +" <img src='images/bullet_delete.png' onclick='removeIpMask(\""+ data + "\");' "+
-                              "class='ptr' alt='<fmt:message key="common.delete"/>' title='<fmt:message key="common.delete"/>'/>";
+                              "class='ptr' alt='<spring:message code="common.delete"/>' title='<spring:message code="common.delete"/>'/>";
                   }
                   ], null);
       }
@@ -115,8 +115,8 @@
                   function(data) { return ""; },
                   function(data) {
                       return data +" <img src='images/bullet_delete.png' onclick='removeDeviceIdMask(\""+ data 
-                              +"\");' class='ptr' alt='<fmt:message key="common.delete"/>' "+
-                              "title='<fmt:message key="common.delete"/>'/>";
+                              +"\");' class='ptr' alt='<spring:message code="common.delete"/>' "+
+                              "title='<spring:message code="common.delete"/>'/>";
                   }
                   ], null);
       }
@@ -129,7 +129,7 @@
   }
   
   function httpListen() {
-      $set("httpListenMessage", "<fmt:message key="dsEdit.httpReceiver.listening"/>");
+      $set("httpListenMessage", "<spring:message code="dsEdit.httpReceiver.listening"/>");
       $set("httpListenData");
       httpListenButtons(true);
       DataSourceEditDwr.httpReceiverListenForData(ipWhiteList, deviceIdWhiteList, httpListenCB);
@@ -149,12 +149,12 @@
           if (result) {
               $set("httpListenMessage", result.message);
               if (result.remoteIp) {
-                  var data = "<b><fmt:message key="dsEdit.httpReceiver.source"/>: "+ result.remoteIp +"</b><br/>";
+                  var data = "<b><spring:message code="dsEdit.httpReceiver.source"/>: "+ result.remoteIp +"</b><br/>";
                   if (result.deviceId)
-                      data += "<b><fmt:message key="dsEdit.httpReceiver.deviceId"/>: "+ result.deviceId +"</b><br/>";
+                      data += "<b><spring:message code="dsEdit.httpReceiver.deviceId"/>: "+ result.deviceId +"</b><br/>";
                   else
-                      data += "<b><fmt:message key="dsEdit.httpReceiver.deviceId"/>: -</b><br/>";
-                  data += "<b><fmt:message key="dsEdit.httpReceiver.time"/>: "+ result.time +"</b><br/>";
+                      data += "<b><spring:message code="dsEdit.httpReceiver.deviceId"/>: -</b><br/>";
+                  data += "<b><spring:message code="dsEdit.httpReceiver.time"/>: "+ result.time +"</b><br/>";
                   for (var i=0; i<result.data.length; i++) {
                       var sample = result.data[i];
                       data += sample.key.replace(/</, "&lt;") +"="+ sample.value.replace(/</, "&lt;");
@@ -172,12 +172,12 @@
   function httpListenCancel() {
       DataSourceEditDwr.cancelTestingUtility(function() {
           httpListenButtons(false);
-          $set("httpListenMessage", "<fmt:message key="common.cancelled"/>");
+          $set("httpListenMessage", "<spring:message code="common.cancelled"/>");
       });
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.httpReceiver.parameter"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.httpReceiver.parameter"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.parameterName; };
   }
   
@@ -207,11 +207,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.httpReceiver.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.httpReceiver.desc"/></c:set>
 <c:set var="dsHelpId" value="httpReceiverDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.httpReceiver.ipWhiteList"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.httpReceiver.ipWhiteList"/></td>
           <td class="formField">
             <table cellpadding="0" cellspacing="0">
               <tr>
@@ -225,12 +225,12 @@
 
         <tr id="noAddressesMessage" style="display:none;">
           <td></td>
-          <td><fmt:message key="dsEdit.httpReceiver.noIpAddresses"/></td>
+          <td><spring:message code="dsEdit.httpReceiver.noIpAddresses"/></td>
         </tr>
         <tbody id="ipWhiteList"></tbody>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.httpReceiver.deviceWhiteList"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.httpReceiver.deviceWhiteList"/></td>
           <td class="formField">
             <table cellpadding="0" cellspacing="0">
               <tr>
@@ -244,7 +244,7 @@
 
         <tr id="noDevicesMessage" style="display:none;">
           <td></td>
-          <td><fmt:message key="dsEdit.httpReceiver.noDevices"/></td>
+          <td><spring:message code="dsEdit.httpReceiver.noDevices"/></td>
         </tr>
         <tbody id="deviceIdWhiteList"></tbody>
       </table>
@@ -255,11 +255,11 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td class="smallTitle"><fmt:message key="dsEdit.httpReceiver.receiverListener"/></td></tr>
+        <tr><td class="smallTitle"><spring:message code="dsEdit.httpReceiver.receiverListener"/></td></tr>
         <tr>
           <td align="center">
-            <input id="httpListenBtn" type="button" value="<fmt:message key="dsEdit.httpReceiver.startListener"/>" onclick="httpListen();"/>
-            <input id="httpListenCancelBtn" type="button" value="<fmt:message key="common.cancel"/>" onclick="httpListenCancel();"/>
+            <input id="httpListenBtn" type="button" value="<spring:message code="dsEdit.httpReceiver.startListener"/>" onclick="httpListen();"/>
+            <input id="httpListenCancelBtn" type="button" value="<spring:message code="common.cancel"/>" onclick="httpListenCancel();"/>
           </td>
         </tr>
         <tr><td id="httpListenMessage" class="formError"></td></tr>
@@ -268,12 +268,12 @@
 
 <tag:pointList pointHelpId="httpReceiverPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpReceiver.httpParamName"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpReceiver.httpParamName"/></td>
     <td class="formField"><input type="text" id="parameterName"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId" onchange="changeDataTypeId();">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -282,7 +282,7 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpReceiver.binaryZeroValue"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpReceiver.binaryZeroValue"/></td>
     <td class="formField"><input id="binary0Value" type="text"/></td>
   </tr>
 </tag:pointList>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpRetriever.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpRetriever.jsp
index eb869538d3..061aa4d501 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpRetriever.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editHttpRetriever.jsp
@@ -64,13 +64,13 @@
     var value = $get("sheaderValue");
 
     if (!key || key.trim().length == 0) {
-      alert("<fmt:message key="publisherEdit.httpSender.keyRequired"/>");
+      alert("<spring:message code="publisherEdit.httpSender.keyRequired"/>");
       return;
     }
 
     for (var i=0; i<staticHeaderList.length; i++) {
       if (staticHeaderList[i].key == key) {
-        alert("<fmt:message key="publisherEdit.httpSender.keyExists"/>: '"+ key +"'");
+        alert("<spring:message code="publisherEdit.httpSender.keyExists"/>: '"+ key +"'");
         return;
       }
     }
@@ -98,7 +98,7 @@
       dwr.util.addRows("staticHeaderList", staticHeaderList, [
         function(data) { return data.key +"="+ data.value; },
         function(data, options) {
-          return "<img src='images/bullet_delete.png' class='ptr' title='<fmt:message key="dsEdit.httpRetriever.removeHeader"/>' "+
+          return "<img src='images/bullet_delete.png' class='ptr' title='<spring:message code="dsEdit.httpRetriever.removeHeader"/>' "+
                   "onclick='removeStaticHeader("+ options.rowIndex + ");'/>";
         }
       ], null);
@@ -182,7 +182,7 @@
   }
 
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.httpRetriever.regex"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.httpRetriever.regex"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
           function(p) { return encodeHtml(p.pointLocator.valueRegex); };
   }
@@ -217,12 +217,12 @@
       if (dataTypeId == <%= DataTypes.BINARY %>) {
           show("valueFormatRow");
           hide("numberFormatHelp");
-          $set("valueFormatLabel", "<fmt:message key="dsEdit.httpRetriever.binaryZeroValue"/>");
+          $set("valueFormatLabel", "<spring:message code="dsEdit.httpRetriever.binaryZeroValue"/>");
       }
       else if (dataTypeId == <%= DataTypes.NUMERIC %>) {
           show("valueFormatRow");
           show("numberFormatHelp");
-          $set("valueFormatLabel", "<fmt:message key="dsEdit.httpRetriever.numberFormat"/>");
+          $set("valueFormatLabel", "<spring:message code="dsEdit.httpRetriever.numberFormat"/>");
       }
       else {
           hide("numberFormatHelp");
@@ -247,11 +247,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.httpRetriever.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.httpRetriever.desc"/></c:set>
 <c:set var="dsHelpId" value="httpRetrieverDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -261,7 +261,7 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.httpRetriever.url"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.httpRetriever.url"/></td>
           <td class="formField">
             <input id="url" type="text" value="${dataSource.url}" class="formLong"/>
             <tag:img png="bullet_go" onclick="openURL()" title="dsEdit.httpRetriever.openUrl"/>
@@ -269,33 +269,33 @@
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.httpRetriever.credentials"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.httpRetriever.credentials"/></td>
           <td class="formField">
-            <fmt:message key="dsEdit.httpRetriever.username"/> <input type="text" id="username" class="formShort"/>
-            <fmt:message key="dsEdit.httpRetriever.password"/> <input type="password" id="password" class="formShort"/>
+            <spring:message code="dsEdit.httpRetriever.username"/> <input type="text" id="username" class="formShort"/>
+            <spring:message code="dsEdit.httpRetriever.password"/> <input type="password" id="password" class="formShort"/>
           </td>
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.staticHeaders"/></td>
+          <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.staticHeaders"/></td>
           <td class="formField">
-            <fmt:message key="publisherEdit.httpSender.headerKey"/> <input type="text" id="sheaderKey" class="formShort"/>
-            <fmt:message key="publisherEdit.httpSender.headerValue"/> <input type="text" id="sheaderValue" class="formShort"/>
+            <spring:message code="publisherEdit.httpSender.headerKey"/> <input type="text" id="sheaderKey" class="formShort"/>
+            <spring:message code="publisherEdit.httpSender.headerValue"/> <input type="text" id="sheaderValue" class="formShort"/>
             <tag:img png="add" title="publisherEdit.httpSender.addStaticHeader" onclick="addStaticHeader()"/>
             <table>
-              <tr id="noStaticHeadersMsg" style="display:none"><td><fmt:message key="publisherEdit.httpSender.noStaticHeaders"/></td></tr>
+              <tr id="noStaticHeadersMsg" style="display:none"><td><spring:message code="publisherEdit.httpSender.noStaticHeaders"/></td></tr>
               <tbody id="staticHeaderList"></tbody>
             </table>
           </td>
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.httpRetriever.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.httpRetriever.timeout"/></td>
           <td class="formField"><input id="timeoutSeconds" type="text" value="${dataSource.timeoutSeconds}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.httpRetriever.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.httpRetriever.retries"/></td>
           <td class="formField"><input id="retries" type="text" value="${dataSource.retries}"/></td>
         </tr>
         <tr>
@@ -310,7 +310,7 @@
 
 <tag:pointList pointHelpId="httpRetrieverPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select name="dataTypeId" onchange="dataTypeChanged()">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -320,7 +320,7 @@
   
   <tr>
     <td class="formLabelRequired">
-      <fmt:message key="dsEdit.httpRetriever.valueRegex"/>
+      <spring:message code="dsEdit.httpRetriever.valueRegex"/>
       <tag:img id="valueTestImg" png="accept" title="dsEdit.httpRetriever.testValue" onclick="testValueParams()"/>
     </td>
     <td class="formField">
@@ -337,7 +337,7 @@
   </tbody>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.httpRetriever.ignoreIfMissing"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.httpRetriever.ignoreIfMissing"/></td>
     <td class="formField"><input type="checkbox" id="ignoreIfMissing"/></td>
   </tr>
   
@@ -353,7 +353,7 @@
   
   <tr>
     <td class="formLabel">
-      <fmt:message key="dsEdit.httpRetriever.timeRegex"/>
+      <spring:message code="dsEdit.httpRetriever.timeRegex"/>
       <tag:img id="timeTestImg" png="accept" title="dsEdit.httpRetriever.testTime" onclick="testTimeParams()"/>
     </td>
     <td class="formField">
@@ -371,7 +371,7 @@
   
   <tbody id="timeFormatRow">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.httpRetriever.timeFormat"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.httpRetriever.timeFormat"/></td>
       <td class="formField">
         <input type="text" id="timeFormat"/>
         <tag:help id="datetimeFormats"/>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101.jsp
index 09df68def3..c07b441807 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101.jsp
@@ -27,10 +27,10 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-	  pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.iec101.iec101DataType"/>";
+	  pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.iec101.iec101DataType"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.iec101DataType; };
 
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.iec101.objectAddress"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.iec101.objectAddress"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.objectAddress; };
   }
   
@@ -84,17 +84,17 @@
 
 <c:choose>
   <c:when test="${dataSource.type.id == applicationScope['constants.DataSourceVO.Types.IEC101_SERIAL']}">
-    <c:set var="dsDesc"><fmt:message key="dsEdit.iec101.descSerial"/></c:set>
+    <c:set var="dsDesc"><spring:message code="dsEdit.iec101.descSerial"/></c:set>
     <c:set var="dsHelpId" value="iec101DS"/>
   </c:when>
   <c:when test="${dataSource.type.id == applicationScope['constants.DataSourceVO.Types.IEC101_ETHERNET']}">
-    <c:set var="dsDesc"><fmt:message key="dsEdit.iec101.descEthernet"/></c:set>
+    <c:set var="dsDesc"><spring:message code="dsEdit.iec101.descEthernet"/></c:set>
     <c:set var="dsHelpId" value="iec101DS"/>
   </c:when>
 </c:choose>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 		<tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.linkLayerAddressSize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.iec101.linkLayerAddressSize"/></td>
           <td class="formField">
 	          <sst:select id="linkLayerAddressSize" value="${dataSource.linkLayerAddressSize}">
 			      <sst:option value="0">None</sst:option>
@@ -105,11 +105,11 @@
           
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.linkLayerAddress"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.iec101.linkLayerAddress"/></td>
           <td class="formField"><input type="text" id="linkLayerAddress" value="${dataSource.linkLayerAddress}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.asduAddressSize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.iec101.asduAddressSize"/></td>
           <td class="formField">
           	<sst:select id="asduAddressSize" value="${dataSource.asduAddressSize}">
 			      <sst:option value="1">1 byte</sst:option>
@@ -118,11 +118,11 @@
           </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.asduAddress"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.iec101.asduAddress"/></td>
           <td class="formField"><input type="text" id="asduAddress" value="${dataSource.asduAddress}"/></td>
         </tr>
          <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.cotSize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.iec101.cotSize"/></td>
           <td class="formField">
           	<sst:select id="cotSize" value="${dataSource.cotSize}">
 			      <sst:option value="1">1 byte</sst:option>
@@ -131,7 +131,7 @@
           </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.objectAddressSize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.iec101.objectAddressSize"/></td>
           <td class="formField">
           	<sst:select id="objectAddressSize" value="${dataSource.objectAddressSize}">
 			      <sst:option value="1">1 byte</sst:option>
@@ -142,7 +142,7 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -151,25 +151,25 @@
           </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.giRelativePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.iec101.giRelativePeriod"/></td>
           <td class="formField"><input type="text" id="giRelativePeriod" value="${dataSource.giRelativePeriod}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.clockSynchRelativePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.iec101.clockSynchRelativePeriod"/></td>
           <td class="formField"><input type="text" id="clockSynchRelativePeriod" value="${dataSource.clockSynchRelativePeriod}"/></td>
         </tr>
              	 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.timeout"/></td>
           <td class="formField"><input type="text" id="timeout" value="${dataSource.timeout}"/></td>
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.retries"/></td>
           <td class="formField"><input type="text" id="retries" value="${dataSource.retries}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.quantize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.quantize"/></td>
           <td class="formField"><sst:checkbox id="quantize" selectedValue="${dataSource.quantize}"/></td>
   		</tr>
               
@@ -190,21 +190,21 @@
 
 <tag:pointList pointHelpId="iec101PP">
 	<tr>
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.objectAddress"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.iec101.objectAddress"/></td>
 	    <td class="formField"><input type="text" id="objectAddress"/></td>
 	</tr>
 	<tr>
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.iec101DataType"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.iec101.iec101DataType"/></td>
 	    <td class="formField">
 	      <select id="iec101DataType" onchange="settableChanged()">
-	        <option value="<c:out value="<%= IEC101Master.SINGLE_POINT_INFORMATION%>"/>"><fmt:message key="dsEdit.iec101.iec101DataType.singlePoint"/></option>
-	        <option value="<c:out value="<%= IEC101Master.DOUBLE_POINT_INFORMATION %>"/>"><fmt:message key="dsEdit.iec101.iec101DataType.doublePoint"/></option>
-	        <option value="<c:out value="<%= IEC101Master.NORMALIZED_MEASURE %>"/>"><fmt:message key="dsEdit.iec101.iec101DataType.normalizedMeasure"/></option>
+	        <option value="<c:out value="<%= IEC101Master.SINGLE_POINT_INFORMATION%>"/>"><spring:message code="dsEdit.iec101.iec101DataType.singlePoint"/></option>
+	        <option value="<c:out value="<%= IEC101Master.DOUBLE_POINT_INFORMATION %>"/>"><spring:message code="dsEdit.iec101.iec101DataType.doublePoint"/></option>
+	        <option value="<c:out value="<%= IEC101Master.NORMALIZED_MEASURE %>"/>"><spring:message code="dsEdit.iec101.iec101DataType.normalizedMeasure"/></option>
 	      </select>
 	    </td>
   	</tr>
   	<tr>
-    	<td class="formLabelRequired"><fmt:message key="dsEdit.settable"/></td>
+    	<td class="formLabelRequired"><spring:message code="dsEdit.settable"/></td>
     	<td class="formField"><input type="checkbox" id="settable" onchange="settableChanged()"/></td>
   	</tr>
   	<tbody id="commandFields">
@@ -212,13 +212,13 @@
 		    <td class="formLabelRequired">Control Mode</td>
 		    <td class="formField">
 		      <select id="controlMode">
-		        <option value="<c:out value="<%= IEC101Master.SELECT_AND_EXECUTE%>"/>"><fmt:message key="dsEdit.iec101.selectExecute"/></option>
-		        <option value="<c:out value="<%= IEC101Master.EXECUTE_ONLY%>"/>"><fmt:message key="dsEdit.iec101.execute"/></option>
+		        <option value="<c:out value="<%= IEC101Master.SELECT_AND_EXECUTE%>"/>"><spring:message code="dsEdit.iec101.selectExecute"/></option>
+		        <option value="<c:out value="<%= IEC101Master.EXECUTE_ONLY%>"/>"><spring:message code="dsEdit.iec101.execute"/></option>
 		      </select>
 		    </td>
   		</tr>
   		<tr>
-		    <td class="formLabelRequired"><fmt:message key="dsEdit.iec101.offset"/></td>
+		    <td class="formLabelRequired"><spring:message code="dsEdit.iec101.offset"/></td>
 		    <td class="formField"><input type="text" id="offset"/></td>
 		</tr>
   	</tbody>
@@ -227,10 +227,10 @@
 		    <td class="formLabelRequired">Qualifier</td>
 		    <td class="formField">
 		      <select id="qualifier">
-		        <option value="<c:out value="<%= IEC101Master.DEFAULT%>"/>"><fmt:message key="dsEdit.iec101.default"/></option>
-		        <option value="<c:out value="<%= IEC101Master.SHORT_PULSE%>"/>"><fmt:message key="dsEdit.iec101.shortPulse"/></option>
-		        <option value="<c:out value="<%= IEC101Master.LONG_PULSE%>"/>"><fmt:message key="dsEdit.iec101.longPulse"/></option>
-		        <option value="<c:out value="<%= IEC101Master.PERSISTENT%>"/>"><fmt:message key="dsEdit.iec101.persistent"/></option>
+		        <option value="<c:out value="<%= IEC101Master.DEFAULT%>"/>"><spring:message code="dsEdit.iec101.default"/></option>
+		        <option value="<c:out value="<%= IEC101Master.SHORT_PULSE%>"/>"><spring:message code="dsEdit.iec101.shortPulse"/></option>
+		        <option value="<c:out value="<%= IEC101Master.LONG_PULSE%>"/>"><spring:message code="dsEdit.iec101.longPulse"/></option>
+		        <option value="<c:out value="<%= IEC101Master.PERSISTENT%>"/>"><spring:message code="dsEdit.iec101.persistent"/></option>
 		      </select>
 		    </td>
   		</tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101Ethernet.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101Ethernet.jsp
index e955afb01a..fe73e59bdf 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101Ethernet.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101Ethernet.jsp
@@ -33,10 +33,10 @@
 </script>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3Ip.host"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.dnp3Ip.host"/></td>
   <td class="formField"><input id="host" type="text" value="${dataSource.host}"/></td>
 </tr>
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.dnp3Ip.port"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.dnp3Ip.port"/></td>
   <td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
 </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101Serial.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101Serial.jsp
index bf2e4c92fa..163bc12e69 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101Serial.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editIEC101Serial.jsp
@@ -34,7 +34,7 @@
 </script>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.port"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.port"/></td>
   <td class="formField">
     <c:choose>
       <c:when test="${!empty commPortError}">
@@ -53,7 +53,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.baud"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.baud"/></td>
   <td class="formField">
     <sst:select id="baudRate" value="${dataSource.baudRate}">
       <sst:option>110</sst:option>
@@ -76,7 +76,7 @@
 
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.dataBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.dataBits"/></td>
   <td class="formField">
     <sst:select id="dataBits" value="${dataSource.dataBits}">
       <sst:option value="5">5</sst:option>
@@ -88,7 +88,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.stopBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.stopBits"/></td>
   <td class="formField">
     <sst:select id="stopBits" value="${dataSource.stopBits}">
       <sst:option value="1">1</sst:option>
@@ -99,14 +99,14 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.parity"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.parity"/></td>
   <td class="formField">
     <sst:select id="parity" value="${dataSource.parity}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.parity.none"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.modbusSerial.parity.odd"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.modbusSerial.parity.even"/></sst:option>
-      <sst:option value="3"><fmt:message key="dsEdit.modbusSerial.parity.mark"/></sst:option>
-      <sst:option value="4"><fmt:message key="dsEdit.modbusSerial.parity.space"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.parity.none"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.modbusSerial.parity.odd"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.modbusSerial.parity.even"/></sst:option>
+      <sst:option value="3"><spring:message code="dsEdit.modbusSerial.parity.mark"/></sst:option>
+      <sst:option value="4"><spring:message code="dsEdit.modbusSerial.parity.space"/></sst:option>
     </sst:select>
   </td>
 </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editInternal.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editInternal.jsp
index 2931e3ad64..ca05134fc5 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editInternal.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editInternal.jsp
@@ -27,7 +27,7 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.internal.attribute"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.internal.attribute"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
               function(p) { return p.pointLocator.configurationDescription; };
   }
@@ -47,11 +47,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.internal.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.internal.desc"/></c:set>
 <c:set var="dsHelpId" value="internalDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -63,7 +63,7 @@
 
 <tag:pointList pointHelpId="internalPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.internal.attribute"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.internal.attribute"/></td>
     <td class="formField">
       <select id="attributeId">
         <tag:exportCodesOptions optionList="<%= InternalPointLocatorVO.ATTRIBUTE_CODES.getIdKeys() %>"/>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editJmx.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editJmx.jsp
index cdb76960bf..cd74362c4b 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editJmx.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editJmx.jsp
@@ -30,7 +30,7 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.jmx.attributeName"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.jmx.attributeName"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
               function(p) { return p.pointLocator.configurationDescription; };
   }
@@ -60,7 +60,7 @@
   }
   
   function getObjectNames() {
-      $set("objectNamesMessage", "<fmt:message key="dsEdit.jmx.gettingObjectNames"/>");
+      $set("objectNamesMessage", "<spring:message code="dsEdit.jmx.gettingObjectNames"/>");
       setDisabled("objectNamesBtn", true);
       
       var tree = dojo.widget.manager.getWidgetById("inspectionTree");
@@ -78,7 +78,7 @@
               $set("objectNamesMessage");
     		  
               var parentNode = dojo.widget.createWidget("TreeNode", {
-            	  title: "<b>"+ (localServer ? "<fmt:message key="dsEdit.jmx.dsconn.local"/>" : $("remoteServerAddr")) +"</b>",
+            	  title: "<b>"+ (localServer ? "<spring:message code="dsEdit.jmx.dsconn.local"/>" : $("remoteServerAddr")) +"</b>",
             	  isFolder: true
               });
     		  tree.addChild(parentNode);
@@ -95,7 +95,7 @@
                     	  var func = "preAddPoint(`"+ name +"`, `"+ attr.name +"`, ``)";
                           attrNode = dojo.widget.createWidget("TreeNode", {
                               title: attr.name +"("+ attr.type +") "+ writeImageSQuote(null, null,
-                                      "icon_comp_add", "<fmt:message key="dsEdit.jmx.addPoint"/>", func),
+                                      "icon_comp_add", "<spring:message code="dsEdit.jmx.addPoint"/>", func),
                               isFolder: false
                           });
                           objNode.addChild(attrNode);
@@ -112,7 +112,7 @@
                               var func = "preAddPoint(`"+ name +"`, `"+ attr.name +"`, `"+ item.name +"`)";
                               var itemNode = dojo.widget.createWidget("TreeNode", { 
                                   title: item.name +"("+ item.type +") "+ writeImageSQuote(null, null,
-                                          "icon_comp_add", "<fmt:message key="dsEdit.jmx.addPoint"/>", func),
+                                          "icon_comp_add", "<spring:message code="dsEdit.jmx.addPoint"/>", func),
                                   isFolder: false
                               });
                               
@@ -148,21 +148,21 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.jmx.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.jmx.desc"/></c:set>
 <c:set var="dsHelpId" value="jmxDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.jmx.useLocalServer"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.jmx.useLocalServer"/></td>
           <td class="formField">
             <sst:checkbox id="useLocalServer" selectedValue="${dataSource.useLocalServer}" onclick="useLocalServerChange()"/>
           </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.jmx.remoteServerAddr"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.jmx.remoteServerAddr"/></td>
           <td class="formField"><input id="remoteServerAddr" type="text" value="${dataSource.remoteServerAddr}"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -171,7 +171,7 @@
           </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.quantize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.quantize"/></td>
           <td class="formField"><sst:checkbox id="quantize" selectedValue="${dataSource.quantize}"/></td>
         </tr>
       </table>
@@ -183,10 +183,10 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.jmx.inspect"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.jmx.inspect"/></td></tr>
         <tr>
           <td colspan="2" align="center">
-            <input id="objectNamesBtn" type="button" value="<fmt:message key="dsEdit.jmx.getObjectNames"/>" onclick="getObjectNames();"/>
+            <input id="objectNamesBtn" type="button" value="<spring:message code="dsEdit.jmx.getObjectNames"/>" onclick="getObjectNames();"/>
           </td>
         </tr>
         
@@ -199,19 +199,19 @@
 
 <tag:pointList pointHelpId="jmxPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.jmx.objectName"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.jmx.objectName"/></td>
     <td class="formField"><input type="text" id="objectName"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.jmx.attributeName"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.jmx.attributeName"/></td>
     <td class="formField"><input type="text" id="attributeName"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.jmx.compositeItemName"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.jmx.compositeItemName"/></td>
     <td class="formField"><input type="text" id="compositeItemName"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId">
         <tag:dataTypeOptions excludeImage="true" excludeMultistate="true"/>
@@ -219,7 +219,7 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.settable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.settable"/></td>
     <td class="formField"><input type="checkbox" id="settable"/></td>
   </tr>
 </tag:pointList>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editMBus.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editMBus.jsp
index 42f473bf67..40c30d32cd 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editMBus.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editMBus.jsp
@@ -130,7 +130,7 @@
                 function(device) { return device.versionHex; },
                 function(device) {
                     return writeImage("responseFramesImg"+ device.index, null, "control_play_blue",
-                    "<fmt:message key='dsEditMbus.getDetails'/>", "getResponseFrames(" + device.index + ")");
+                    "<spring:message code='dsEditMbus.getDetails'/>", "getResponseFrames(" + device.index + ")");
                 }
 
             ],
@@ -185,12 +185,12 @@
                     var dataBlock = responseFrame.dataBlocks[dbIndex];
                     var dataBlockNode = dojo.widget.createWidget("TreeNode", {
                         title: dataBlock.name + "(" + dataBlock.params  + ")" + writeImageSQuote(null, null,
-                        "icon_comp_add", "<fmt:message key='dsEdit.mbus.addPoint'/>", "addPoint( { 'addressing': '" + result.addressing + "', 'deviceIndex': "+ result.deviceIndex + ", 'rsIndex': " + rsIndex + ", 'dbIndex': " + dbIndex + "})"),
+                        "icon_comp_add", "<spring:message code='dsEdit.mbus.addPoint'/>", "addPoint( { 'addressing': '" + result.addressing + "', 'deviceIndex': "+ result.deviceIndex + ", 'rsIndex': " + rsIndex + ", 'dbIndex': " + dbIndex + "})"),
                         isFolder: "true"});
                     responseFrameNode.addChild(dataBlockNode);
 
                     dataBlockNode.addChild(dojo.widget.createWidget("TreeNode",
-                    { title: "<fmt:message key='dsEdit.mbus.presentValue'/>: "+ dataBlock.value}));
+                    { title: "<spring:message code='dsEdit.mbus.presentValue'/>: "+ dataBlock.value}));
                 }
 
             }
@@ -205,7 +205,7 @@
     }
 
     function cancelSearchCB() {
-        $set("searchMessage", "<fmt:message key='dsEdit.mbus.seachStopped'/>");
+        $set("searchMessage", "<spring:message code='dsEdit.mbus.seachStopped'/>");
         searchButtons(false);
     }
 
@@ -217,64 +217,64 @@
 
 
     function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.correctionFactor'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.correctionFactor'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.correctionFactor; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.addressing'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.addressing'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.addressing; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.addressHex'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.addressHex'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.addressHex; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.identNumber'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.identNumber'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.identNumber; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.medium'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.medium'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.medium; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.manufacturer'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.manufacturer'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.manufacturer; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.versionHex'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.versionHex'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.versionHex; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.responseFrame'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.responseFrame'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.responseFrame; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.difCode'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.difCode'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.difCode; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.functionField'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.functionField'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.functionField; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.deviceUnit'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.deviceUnit'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.deviceUnit; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.tariff'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.tariff'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.tariff; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.storageNumber'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.storageNumber'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.storageNumber; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.vifType'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.vifType'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.vifType; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.vifLabel'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.vifLabel'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.vifLabel; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.unitOfMeasurement'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.unitOfMeasurement'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.unitOfMeasurement; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.siPrefix'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.siPrefix'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.siPrefix; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.exponent'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.exponent'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.exponent; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.vifeTypes'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.vifeTypes'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.vifeTypes; };
         
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.mbus.vifeLabels'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.mbus.vifeLabels'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.vifeLabels; };
 
     }
@@ -371,14 +371,14 @@
 
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.mbus.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.mbus.desc"/></c:set>
 <c:set var="dsHelpId" value="mbusDS"/>
 <%@include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 <!-- Disable modem for now-->
 <tr>
     <td colspan="2">
         <input type="radio" name="connectionType" id="useTcpIpConnection" value="TCP_IP" <c:if test="${dataSource.tcpIp}">checked="checked"</c:if> onclick="updateConnetionType()" disabled="disabled">
-        <label class="formLabelRequired" for="useDirectConnection"><fmt:message key="dsEdit.mbus.useTcpIpConnection"/></label>
+        <label class="formLabelRequired" for="useDirectConnection"><spring:message code="dsEdit.mbus.useTcpIpConnection"/></label>
     </td>
 </tr>
 <tr>
@@ -386,17 +386,17 @@
         <table>
             <tr>
                 <td width="30" />
-                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.tcpAddr"/></td>
+                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.tcpAddr"/></td>
                 <td class="formField"><input type="text" id="ipAddressOrHostname" value="${dataSource.tcpIp ? dataSource.connection.host : ""}" /></td>
             </tr>
             <tr>
                 <td width="30" />
-                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.tcpPort"/>
+                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.tcpPort"/>
                 <td class="formField"><input type="text" id="tcpPort" value="${dataSource.tcpIp ? dataSource.connection.port: ""}" /></td>
             </tr>
             <tr>
                 <td width="30" />
-                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.tcpIpBitPerSecond"/></td>
+                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.tcpIpBitPerSecond"/></td>
                 <td class="formField"><input type="text" id="tcpIpBitPerSecond" value="${dataSource.tcpIp ? dataSource.connection.bitPerSecond: ""}" /></td>
             </tr>
         </table>
@@ -405,7 +405,7 @@
 <tr>
     <td colspan="2">
         <input type="radio" name="connectionType" id="useDirectConnection" value="SERIAL_DIRECT" <c:if test="${dataSource.serialDirect}">checked="checked"</c:if> onclick="updateConnectionType()" disabled="disabled">
-        <label class="formLabelRequired" for="useDirectConnection"><fmt:message key="dsEdit.mbus.useDirectConnection"/></label>
+        <label class="formLabelRequired" for="useDirectConnection"><spring:message code="dsEdit.mbus.useDirectConnection"/></label>
     </td>
     <td/>
 </tr>
@@ -416,7 +416,7 @@
                 <td width="30" />
                 <td colspan=""2">
                     <input type="checkbox" name="phoneNumber" id="phoneNumber" <c:if test="${dataSource.serialAtModem}"> checked="checked"</c:if> onclick="updatePhoneNumber()" />
-                    <label class="formLabelRequired" for="phoneNumber"><fmt:message key="dsEdit.mbus.phoneNumber"/></label>
+                    <label class="formLabelRequired" for="phoneNumber"><spring:message code="dsEdit.mbus.phoneNumber"/></label>
                     <input type="text" id="phoneNumberText" value="${dataSource.serialAtModem ? dataSource.connection.phoneNumber : ""}" />
                 </td>
             </tr>
@@ -439,14 +439,14 @@
 
 <tr>
     <td colspan="3">
-        <label class="formLabelRequired" for="responseTimeOutOffset" ><fmt:message key="dsEdit.mbus.responseTimeOutOffset"/></label>
+        <label class="formLabelRequired" for="responseTimeOutOffset" ><spring:message code="dsEdit.mbus.responseTimeOutOffset"/></label>
         <input class="formShort" type="text" id="responseTimeOutOffset" value="${dataSource.connection.responseTimeOutOffset}" />
         <label class="formLabelRequired">ms</label>
     </td>
 </tr>
 <tr>
     <td colspan="3">
-        <label class="formLabelRequired" for="updatePeriods" ><fmt:message key="dsEdit.updatePeriod"/></label>
+        <label class="formLabelRequired" for="updatePeriods" ><spring:message code="dsEdit.updatePeriod"/></label>
         <input class="formShort" type="text" id="updatePeriods" value="${dataSource.updatePeriods}" />
         <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
             <tag:timePeriodOptions sst="true" s="true" min="true" h="true" d="true" w="true" mon="true"/>
@@ -463,11 +463,11 @@
     <div class="borderDiv marB">
         <table>
             <tbody>
-                <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.mbus.search"/></td></tr>
+                <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.mbus.search"/></td></tr>
                 <tr>
                     <td>
                         <input type="radio" name="addressingType" id="usePrimnaryAddressing" value="PRIMARY" onclick="updateAddressing()">
-                        <label class="formLabelRequired" for="usePrimnaryAddressing"><fmt:message key="dsEdit.mbus.usePrimaryAddressing"/></label>
+                        <label class="formLabelRequired" for="usePrimnaryAddressing"><spring:message code="dsEdit.mbus.usePrimaryAddressing"/></label>
                     </td>
                 </tr>
                 <tr>
@@ -475,12 +475,12 @@
                         <table>
                             <tr>
                                 <td width="30" />
-                                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.firstHexAddress"/></td>
+                                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.firstHexAddress"/></td>
                                 <td class="formField"><input type="text" id="firstPrimaryAddress" value="00"/></td>
                             </tr>
                             <tr>
                                 <td width="30" />
-                                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.lastHexAddress"/></td>
+                                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.lastHexAddress"/></td>
                                 <td class="formField"><input type="text" id="lastPrimaryAddress" value="FA"/></td>
                             </tr>
                         </table>
@@ -488,7 +488,7 @@
                 <tr>
                     <td colspan="2">
                         <input type="radio" name="addressingType" id="useSecondaryAddressing" checked="checked" value="SECONDARY" onclick="updateAddressing()">
-                        <label class="formLabelRequired" for="useSecondaryAddressing"><fmt:message key="dsEdit.mbus.useSecondaryAddressing"/></label>
+                        <label class="formLabelRequired" for="useSecondaryAddressing"><spring:message code="dsEdit.mbus.useSecondaryAddressing"/></label>
                     </td>
                 </tr>
                 <tr>
@@ -496,17 +496,17 @@
                         <table>
                             <tr>
                                 <td width="30" />
-                                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.id"/></td>
+                                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.id"/></td>
                                 <td class="formField"><input type="text" id="secAddrId" value=""/></td>
                             </tr>
                             <tr>
                                 <td width="30" />
-                                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.man"/></td>
+                                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.man"/></td>
                                 <td class="formField"><input type="text" id="secAddrMan" value=""/></td>
                             </tr>
                             <tr>
                                 <td width="30" />
-                                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.secAddrMedium"/></td>
+                                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.secAddrMedium"/></td>
                                 <td class="formField">
                                     <sst:select id="secAddrMedium" value="">
                                         <sst:option></sst:option>
@@ -518,7 +518,7 @@
                             </tr>
                             <tr>
                                 <td width="30" />
-                                <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.version"/></td>
+                                <td class="formLabelRequired"><spring:message code="dsEdit.mbus.version"/></td>
                                 <td class="formField"><input type="text" id="secAddrVersion" value=""/></td>
                             </tr>
                         </table>
@@ -529,8 +529,8 @@
         <table>
             <tr>
                 <td colspan="2" align="center">
-                        <input id="searchBtn" type="button" value="<fmt:message key="dsEdit.mbus.search"/>" onclick="search();"/>
-                        <input id="cancelSearchBtn" type="button" value="<fmt:message key="common.cancel"/>" onclick="cancelSearch();"/>
+                        <input id="searchBtn" type="button" value="<spring:message code="dsEdit.mbus.search"/>" onclick="search();"/>
+                        <input id="cancelSearchBtn" type="button" value="<spring:message code="common.cancel"/>" onclick="cancelSearch();"/>
                 </td>
             </tr>
 
@@ -540,11 +540,11 @@
                 <td colspan="2">
                     <table cellspacing="1">
                         <tr class="rowHeader">
-                            <td><fmt:message key="dsEdit.mbus.addressHex"/></td>
-                            <td><fmt:message key="dsEdit.mbus.identNumber"/></td>
-                            <td><fmt:message key="dsEdit.mbus.medium"/></td>
-                            <td><fmt:message key="dsEdit.mbus.manufacturer"/></td>
-                            <td><fmt:message key="dsEdit.mbus.versionHex"/></td>
+                            <td><spring:message code="dsEdit.mbus.addressHex"/></td>
+                            <td><spring:message code="dsEdit.mbus.identNumber"/></td>
+                            <td><spring:message code="dsEdit.mbus.medium"/></td>
+                            <td><spring:message code="dsEdit.mbus.manufacturer"/></td>
+                            <td><spring:message code="dsEdit.mbus.versionHex"/></td>
                         </tr>
                         <tbody id="mbusDevices"></tbody>
                     </table>
@@ -561,99 +561,99 @@
             <tag:pointList pointHelpId="mbusPP">
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.correctionFactor"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.correctionFactor"/></td>
                     <td class="formField"><input type="text" id="correctionFactor"/></td>
                 </tr>
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.addressing"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.addressing"/></td>
                     <td class="formField"><input type="text" id="addressing" disabled="disabled"/></td>
                 </tr>
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.addressHex"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.addressHex"/></td>
                     <td class="formField"><input type="text" id="addressHex" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.identNumber"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.identNumber"/></td>
                     <td class="formField"><input type="text" id="identNumber" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.medium"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.medium"/></td>
                     <td class="formField"><input type="text" id="medium" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.manufacturer"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.manufacturer"/></td>
                     <td class="formField"><input type="text" id="manufacturer" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.versionHex"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.versionHex"/></td>
                     <td class="formField"><input type="text" id="versionHex" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.responseFrame"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.responseFrame"/></td>
                     <td class="formField"><input type="text" id="responseFrame" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.difCode"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.difCode"/></td>
                     <td class="formField"><input type="text" id="difCode" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.functionField"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.functionField"/></td>
                     <td class="formField"><input type="text" id="functionField" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.deviceUnit"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.deviceUnit"/></td>
                     <td class="formField"><input type="text" id="deviceUnit" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.tariff"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.tariff"/></td>
                     <td class="formField"><input type="text" id="tariff" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.storageNumber"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.storageNumber"/></td>
                     <td class="formField"><input type="text" id="storageNumber" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.vifType"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.vifType"/></td>
                     <td class="formField"><input type="text" id="vifType" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.vifLabel"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.vifLabel"/></td>
                     <td class="formField"><input type="text" id="vifLabel" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.unitOfMeasurement"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.unitOfMeasurement"/></td>
                     <td class="formField"><input type="text" id="unitOfMeasurement" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.siPrefix"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.siPrefix"/></td>
                     <td class="formField"><input type="text" id="siPrefix" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.exponent"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.exponent"/></td>
                     <td class="formField"><input type="text" id="exponent" disabled="disabled"/></td>
                 </tr>
 
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.vifeTypes"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.vifeTypes"/></td>
                     <td class="formField"><input type="text" id="vifeTypes" disabled="disabled"/></td>
                 </tr>
                 <tr>
-                    <td class="formLabelRequired"><fmt:message key="dsEdit.mbus.vifeLabels"/></td>
+                    <td class="formLabelRequired"><spring:message code="dsEdit.mbus.vifeLabels"/></td>
                     <td class="formField"><input type="text" id="vifeLabels" disabled="disabled"/></td>
                 </tr>
 
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editMeta.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editMeta.jsp
index b318e9fb03..b5faf28c01 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editMeta.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editMeta.jsp
@@ -22,15 +22,15 @@
 
 <script type="text/javascript">
   var pointsArray = new Array();
-  var contextArray = new Array();
+  var scriptPointsContext;
   
   function initImpl() {
       <c:forEach items="${userPoints}" var="dp">
         pointsArray[pointsArray.length] = {
             id : ${dp.id}, 
-            name : '${sst:quotEncode(dp.extendedName)}',
-            xid : '${dp.xid}',
-            type : '<sst:i18n message="${dp.dataTypeMessage}"/>'
+            name : "<c:out value="${dp.extendedName}"/>",
+            xid : "<c:out value="${dp.xid}"/>",
+            type : "<sst:i18n message="${dp.dataTypeMessage}"/>"
         };
       </c:forEach>
       
@@ -50,7 +50,7 @@
      // pointListColumnFunctions.push(function(p) {
      //     var id = "generateImg"+ p.id;
      //     var onclick = "generateHistory("+ p.id +")";
-     //     return writeImage(id, null, "clock-history", "<fmt:message key="dsEdit.meta.generate"/>", onclick);
+     //     return writeImage(id, null, "clock-history", "<spring:message code="dsEdit.meta.generate"/>", onclick);
      // });
      return null;
   }
@@ -68,10 +68,7 @@
   }
   
   function editPointCBImpl(locator) {
-      contextArray.length = 0;
-      for (var i=0; i<locator.context.length; i++)
-          addToContextArray(locator.context[i].key, locator.context[i].value);
-      writeContextArray();
+      this.scriptPointsContext = new ScriptPointsContext(locator.context, pointsArray);
       
       $set("script", locator.script);
       $set("dataTypeId", locator.dataTypeId);
@@ -86,7 +83,7 @@
   }
   
   function savePointImpl(locator) {
-      locator.context = createContextArray();
+      locator.context = this.scriptPointsContext.convertToSave();
       locator.script = $get("script");
       locator.dataTypeId = $get("dataTypeId");
       locator.settable = $get("settable");
@@ -97,108 +94,10 @@
       
       DataSourceEditDwr.saveMetaPointLocator(currentPoint.id, $get("xid"), $get("name"), locator, savePointCB);
   }
-  
-  function addPointToContext() {
-      var pointId = $get("allPointsList");
-      addToContextArray(pointId, "p"+ pointId);
-      writeContextArray();
-  }
-  
-  function addToContextArray(pointId, scriptVarName) {
-      var data = getElement(pointsArray, pointId);
-      if (data) {
-          // Missing names imply that the point was deleted, so ignore.
-          contextArray[contextArray.length] = {
-              pointId : pointId,
-              pointName : data.name,
-              xid : data.xid,
-              pointType : data.type,
-              scriptVarName : scriptVarName
-          };
-      }
-  }
-  
-  function removeFromContextArray(pointId) {
-      for (var i=contextArray.length-1; i>=0; i--) {
-          if (contextArray[i].pointId == pointId)
-              contextArray.splice(i, 1);
-      }
-      writeContextArray();
-  }
-  
-  function writeContextArray() {
-      dwr.util.removeAllRows("contextTable");
-      if (contextArray.length == 0) {
-          show($("contextTableEmpty"));
-          hide($("contextTableHeaders"));
-      }
-      else {
-          hide($("contextTableEmpty"));
-          show($("contextTableHeaders"));
-          dwr.util.addRows("contextTable", contextArray,
-              [
-                  function(data) { return data.pointName; },
-                  function(data) { return data.xid; },
-                  function(data) { return data.pointType; },
-                  function(data) {
-                          return "<input type='text' value='"+ data.scriptVarName +"' class='formShort' "+
-                                  "onblur='updateScriptVarName("+ data.pointId +", this.value)'/>";
-                  },
-                  function(data) { 
-                          return "<img src='images/bullet_delete.png' class='ptr' "+
-                                  "onclick='removeFromContextArray("+ data.pointId +")'/>";
-                  }
-              ],
-              {
-                  rowCreator:function(options) {
-                      var tr = document.createElement("tr");
-                      tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
-                      return tr;
-                  }
-              });
-      }
-      updatePointsList();
-  }
-  
-  function updatePointsList() {
-      dwr.util.removeAllOptions("allPointsList");
-      var availPoints = new Array();
-      for (var i=0; i<pointsArray.length; i++) {
-          var found = false;
-          for (var j=0; j<contextArray.length; j++) {
-              if (contextArray[j].pointId == pointsArray[i].id) {
-                  found = true;
-                  break;
-              }
-          }
-          if (!found)
-              availPoints[availPoints.length] = pointsArray[i];
-      }
-      dwr.util.addOptions("allPointsList", availPoints, "id", "name");
-      jQuery("#allPointsList").trigger('chosen:updated');
-  }
-  
-  function updateScriptVarName(pointId, scriptVarName) {
-      for (var i=contextArray.length-1; i>=0; i--) {
-          if (contextArray[i].pointId == pointId)
-              contextArray[i].scriptVarName = scriptVarName;
-      }
-  }
-  
+
   function validateScript() {
       hideContextualMessages("pointProperties");
-      DataSourceEditDwr.validateScript($get("script"), createContextArray(), $get("dataTypeId"), validateScriptCB);
-  }
-  
-  function createContextArray() {
-      var context = new Array();
-      for (var i=0; i<contextArray.length; i++) {
-          context[context.length] = {
-              key : contextArray[i].pointId,
-              value : contextArray[i].scriptVarName
-          };
-      }
-      return context;
+      DataSourceEditDwr.validateScript($get("script"), this.scriptPointsContext.convertToSave(), $get("dataTypeId"), validateScriptCB);
   }
   
   function validateScriptCB(response) {
@@ -217,14 +116,14 @@
   });
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.meta.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.meta.desc"/></c:set>
 <c:set var="dsHelpId" value="metaDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsEventsFoot.jspf" %>
 
 <tag:pointList pointHelpId="metaPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -233,26 +132,26 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.settable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.settable"/></td>
     <td class="formField"><input type="checkbox" id="settable"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.meta.scriptContext"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.meta.scriptContext"/></td>
     <td class="formField">
       <select id="allPointsList"></select>
-      <tag:img png="add" onclick="addPointToContext();" title="common.add"/>
+      <tag:img png="add" onclick="scriptPointsContext.addPointToContext();" title="common.add"/>
       
       <table cellspacing="1" id="contextContainer">
         <tbody id="contextTableEmpty" style="display:none;">
-          <tr><th colspan="4"><fmt:message key="dsEdit.meta.noPoints"/></th></tr>
+          <tr><th colspan="4"><spring:message code="dsEdit.meta.noPoints"/></th></tr>
         </tbody>
         <tbody id="contextTableHeaders" style="display:none;">
           <tr class="smRowHeader">
-            <td><fmt:message key="dsEdit.meta.pointName"/></td>
-            <td><fmt:message key="pointHierarchySLTS.xid"/></td>
-            <td><fmt:message key="dsEdit.pointDataType"/></td>
-            <td><fmt:message key="dsEdit.meta.var"/></td>
+            <td><spring:message code="dsEdit.meta.pointName"/></td>
+            <td><spring:message code="pointHierarchySLTS.xid"/></td>
+            <td><spring:message code="dsEdit.pointDataType"/></td>
+            <td><spring:message code="dsEdit.meta.var"/></td>
             <td></td>
           </tr>
         </tbody>
@@ -263,35 +162,35 @@
   
   <tr>
     <td class="formLabelRequired">
-      <fmt:message key="dsEdit.meta.script"/> <tag:img png="accept" onclick="validateScript();" title="dsEdit.meta.validate"/>
+      <spring:message code="dsEdit.meta.script"/> <tag:img png="accept" onclick="validateScript();" title="dsEdit.meta.validate"/>
     </td>
     <td class="formField"><textarea id="script" rows="10" cols="50"/></textarea></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.meta.event"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.meta.event"/></td>
     <td class="formField">
       <select id="updateEvent" onchange="updateEventChanged()">
-        <option value="<c:out value="<%= MetaPointLocatorVO.UPDATE_EVENT_CONTEXT_UPDATE %>"/>"><fmt:message key="dsEdit.meta.event.context"/></option>
-        <option value="<c:out value="<%= MetaPointLocatorVO.UPDATE_EVENT_CONTEXT_CHANGE %>"/>"><fmt:message key="dsEdit.meta.event.context.change"/></option>
-        <option value="<c:out value="<%= Common.TimePeriods.MINUTES %>"/>"><fmt:message key="dsEdit.meta.event.minute"/></option>
-        <option value="<c:out value="<%= Common.TimePeriods.HOURS %>"/>"><fmt:message key="dsEdit.meta.event.hour"/></option>
-        <option value="<c:out value="<%= Common.TimePeriods.DAYS %>"/>"><fmt:message key="dsEdit.meta.event.day"/></option>
-        <option value="<c:out value="<%= Common.TimePeriods.WEEKS %>"/>"><fmt:message key="dsEdit.meta.event.week"/></option>
-        <option value="<c:out value="<%= Common.TimePeriods.MONTHS %>"/>"><fmt:message key="dsEdit.meta.event.month"/></option>
-        <option value="<c:out value="<%= Common.TimePeriods.YEARS %>"/>"><fmt:message key="dsEdit.meta.event.year"/></option>
-        <option value="<c:out value="<%= MetaPointLocatorVO.UPDATE_EVENT_CRON %>"/>"><fmt:message key="dsEdit.meta.event.cron"/></option>
+        <option value="<c:out value="<%= MetaPointLocatorVO.UPDATE_EVENT_CONTEXT_UPDATE %>"/>"><spring:message code="dsEdit.meta.event.context"/></option>
+        <option value="<c:out value="<%= MetaPointLocatorVO.UPDATE_EVENT_CONTEXT_CHANGE %>"/>"><spring:message code="dsEdit.meta.event.context.change"/></option>
+        <option value="<c:out value="<%= Common.TimePeriods.MINUTES %>"/>"><spring:message code="dsEdit.meta.event.minute"/></option>
+        <option value="<c:out value="<%= Common.TimePeriods.HOURS %>"/>"><spring:message code="dsEdit.meta.event.hour"/></option>
+        <option value="<c:out value="<%= Common.TimePeriods.DAYS %>"/>"><spring:message code="dsEdit.meta.event.day"/></option>
+        <option value="<c:out value="<%= Common.TimePeriods.WEEKS %>"/>"><spring:message code="dsEdit.meta.event.week"/></option>
+        <option value="<c:out value="<%= Common.TimePeriods.MONTHS %>"/>"><spring:message code="dsEdit.meta.event.month"/></option>
+        <option value="<c:out value="<%= Common.TimePeriods.YEARS %>"/>"><spring:message code="dsEdit.meta.event.year"/></option>
+        <option value="<c:out value="<%= MetaPointLocatorVO.UPDATE_EVENT_CRON %>"/>"><spring:message code="dsEdit.meta.event.cron"/></option>
       </select>
     </td>
   </tr>
   
   <tr id="updateCronPatternRow">
-    <td class="formLabelRequired"><fmt:message key="dsEdit.meta.event.cron"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.meta.event.cron"/></td>
     <td class="formField"><input id="updateCronPattern" type="text"/> <tag:help id="cronPatterns"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.meta.delay"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.meta.delay"/></td>
     <td class="formField">
         <input id="executionDelaySeconds" type="text" class="formShort"/>
         <sst:select id="executionDelayPeriodTypeCode">
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp
index 2f865da43c..12dfa98e18 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp
@@ -28,7 +28,7 @@
   }
   
   function scan() {
-      $set("scanMessage", "<fmt:message key="dsEdit.modbus.startScan"/>");
+      $set("scanMessage", "<spring:message code="dsEdit.modbus.startScan"/>");
       dwr.util.removeAllOptions("scanNodes");
       scanButtons(true);
       scanImpl();
@@ -70,12 +70,12 @@
 
       let messages = [];
 
-      validateValue("test_slaveId", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, locator.slaveId, messages);
-      validateValue("test_range", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, locator.range, messages);
-      validateValue("test_modbusDataType", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, locator.modbusDataType, messages);
-      validateValue("test_offset", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, locator.offset, messages);
-      validateValue("test_bit", "<fmt:message key='validate.invalidValue'/>", isPositiveByte, locator.bit, messages);
-      validateValue("test_registerCount", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, locator.registerCount, messages);
+      validateValue("test_slaveId", "<spring:message code='badIntegerFormat'/>", isPositiveInt, locator.slaveId, messages);
+      validateValue("test_range", "<spring:message code='badIntegerFormat'/>", isPositiveInt, locator.range, messages);
+      validateValue("test_modbusDataType", "<spring:message code='badIntegerFormat'/>", isPositiveInt, locator.modbusDataType, messages);
+      validateValue("test_offset", "<spring:message code='badIntegerFormat'/>", isPositiveInt, locator.offset, messages);
+      validateValue("test_bit", "<spring:message code='validate.invalidValue'/>", isPositiveByte, locator.bit, messages);
+      validateValue("test_registerCount", "<spring:message code='badIntegerFormat'/>", isPositiveInt, locator.registerCount, messages);
 
       return messages;
   }
@@ -178,10 +178,10 @@
 
       let messages = [];
 
-      validateValue("dataTest_slaveId", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, testData.slaveId, messages);
-      validateValue("dataTest_range", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, testData.range, messages);
-      validateValue("dataTest_offset", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, testData.offset, messages);
-      validateValue("dataTest_length", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, testData.length, messages);
+      validateValue("dataTest_slaveId", "<spring:message code='badIntegerFormat'/>", isPositiveInt, testData.slaveId, messages);
+      validateValue("dataTest_range", "<spring:message code='badIntegerFormat'/>", isPositiveInt, testData.range, messages);
+      validateValue("dataTest_offset", "<spring:message code='badIntegerFormat'/>", isPositiveInt, testData.offset, messages);
+      validateValue("dataTest_length", "<spring:message code='badIntegerFormat'/>", isPositiveInt, testData.length, messages);
 
       return messages;
   }
@@ -231,19 +231,19 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.modbus.slave"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.modbus.slave"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.slaveId; };
       
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.modbus.range"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.modbus.range"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) {
           if (p.pointLocator.slaveMonitor)
-              return "<fmt:message key="dsEdit.modbus.slaveMonitor"/>";
+              return "<spring:message code="dsEdit.modbus.slaveMonitor"/>";
           if (p.pointLocator.socketMonitor)
-              return "<fmt:message key="dsEdit.modbus.socketMonitor"/>";
+              return "<spring:message code="dsEdit.modbus.socketMonitor"/>";
           return p.pointLocator.rangeMessage;
       };
       
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.modbus.offset"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.modbus.offset"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) {
     	  if (p.pointLocator.slaveMonitor)
     		  return "";
@@ -368,17 +368,17 @@
 
 <c:choose>
   <c:when test="${dataSource.type.id == applicationScope['constants.DataSourceVO.Types.MODBUS_SERIAL']}">
-    <c:set var="dsDesc"><fmt:message key="dsEdit.modbus.descSerial"/></c:set>
+    <c:set var="dsDesc"><spring:message code="dsEdit.modbus.descSerial"/></c:set>
     <c:set var="dsHelpId" value="modbusSerialDS"/>
   </c:when>
   <c:when test="${dataSource.type.id == applicationScope['constants.DataSourceVO.Types.MODBUS_IP']}">
-    <c:set var="dsDesc"><fmt:message key="dsEdit.modbus.descIp"/></c:set>
+    <c:set var="dsDesc"><spring:message code="dsEdit.modbus.descIp"/></c:set>
     <c:set var="dsHelpId" value="modbusIpDS"/>
   </c:when>
 </c:choose>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -388,42 +388,42 @@
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.quantize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.quantize"/></td>
           <td class="formField"><sst:checkbox id="quantize" selectedValue="${dataSource.quantize}"/></td>
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.timeout"/></td>
           <td class="formField"><input type="text" id="timeout" value="${dataSource.timeout}"/></td>
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.retries"/></td>
           <td class="formField"><input type="text" id="retries" value="${dataSource.retries}"/></td>
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.contiguousBatches"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.contiguousBatches"/></td>
           <td class="formField"><sst:checkbox id="contiguousBatches" selectedValue="${dataSource.contiguousBatches}"/></td>
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.createSlaveMonitorPoints"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.createSlaveMonitorPoints"/></td>
           <td class="formField"><sst:checkbox id="createSlaveMonitorPoints" selectedValue="${dataSource.createSlaveMonitorPoints}"/></td>
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.maxReadBitCount"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.maxReadBitCount"/></td>
           <td class="formField"><input type="text" id="maxReadBitCount" value="${dataSource.maxReadBitCount}"/></td>
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.maxReadRegisterCount"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.maxReadRegisterCount"/></td>
           <td class="formField"><input type="text" id="maxReadRegisterCount" value="${dataSource.maxReadRegisterCount}"/></td>
         </tr>
               
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.maxWriteRegisterCount"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.maxWriteRegisterCount"/></td>
           <td class="formField"><input type="text" id="maxWriteRegisterCount" value="${dataSource.maxWriteRegisterCount}"/></td>
         </tr>
               
@@ -443,18 +443,18 @@
   <td valign="top">
     <div class="borderDiv marB marR" style="float:left;">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.modbus.nodeScan"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.modbus.nodeScan"/></td></tr>
         <tr>
           <td colspan="2" align="center">
-            <input id="scanBtn" type="button" value="<fmt:message key="dsEdit.modbus.scanForNodes"/>" onclick="scan();"/>
-            <input id="scanCancelBtn" type="button" value="<fmt:message key="common.cancel"/>" onclick="scanCancel();"/>
+            <input id="scanBtn" type="button" value="<spring:message code="dsEdit.modbus.scanForNodes"/>" onclick="scan();"/>
+            <input id="scanCancelBtn" type="button" value="<spring:message code="common.cancel"/>" onclick="scanCancel();"/>
           </td>
         </tr>
         
         <tr><td colspan="2" id="scanMessage" class="formError"></td></tr>
         
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.modbus.nodesFound"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.modbus.nodesFound"/></td>
           <td class="formField"><select id="scanNodes" size="8"></select></td>
         </tr>
       </table>
@@ -462,38 +462,38 @@
     
     <div class="borderDiv marB marR" style="float:left;" id="dataTestDiv">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.modbus.dataTest"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.modbus.dataTest"/></td></tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.slaveId"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.slaveId"/></td>
           <td class="formField"><input type="text" id="dataTest_slaveId" value="1"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.registerRange"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.registerRange"/></td>
           <td class="formField">
             <select id="dataTest_range">
-              <option value="<c:out value="<%= RegisterRange.COIL_STATUS %>"/>"><fmt:message key="dsEdit.modbus.coilStatus"/></option>
-              <option value="<c:out value="<%= RegisterRange.INPUT_STATUS %>"/>"><fmt:message key="dsEdit.modbus.inputStatus"/></option>
-              <option value="<c:out value="<%= RegisterRange.HOLDING_REGISTER %>"/>"><fmt:message key="dsEdit.modbus.holdingRegister"/></option>
-              <option value="<c:out value="<%= RegisterRange.INPUT_REGISTER %>"/>"><fmt:message key="dsEdit.modbus.inputRegister"/></option>
+              <option value="<c:out value="<%= RegisterRange.COIL_STATUS %>"/>"><spring:message code="dsEdit.modbus.coilStatus"/></option>
+              <option value="<c:out value="<%= RegisterRange.INPUT_STATUS %>"/>"><spring:message code="dsEdit.modbus.inputStatus"/></option>
+              <option value="<c:out value="<%= RegisterRange.HOLDING_REGISTER %>"/>"><spring:message code="dsEdit.modbus.holdingRegister"/></option>
+              <option value="<c:out value="<%= RegisterRange.INPUT_REGISTER %>"/>"><spring:message code="dsEdit.modbus.inputRegister"/></option>
             </select>
           </td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.offset"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.offset"/></td>
           <td class="formField"><input type="text" id="dataTest_offset" value="0"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.registerCount"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.registerCount"/></td>
           <td class="formField"><input type="text" id="dataTest_length" value="100"/></td>
         </tr>
         
         <tr>
           <td colspan="2" align="center">
-            <input id="dataTestBtn" type="button" value="<fmt:message key="dsEdit.modbus.dataTest.read"/>" onclick="dataTest();"/>
+            <input id="dataTestBtn" type="button" value="<spring:message code="dsEdit.modbus.dataTest.read"/>" onclick="dataTest();"/>
           </td>
         </tr>
         
@@ -505,77 +505,77 @@
     
     <div class="borderDiv marB" id="locatorTestDiv" style="clear:both;">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.modbus.locatorTest"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.modbus.locatorTest"/></td></tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.slaveId"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.slaveId"/></td>
           <td class="formField"><input type="text" id="test_slaveId" value="1"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.registerRange"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.registerRange"/></td>
           <td class="formField">
             <select id="test_range" onchange="changeRange('test_')">
-              <option value="<c:out value="<%= RegisterRange.COIL_STATUS %>"/>"><fmt:message key="dsEdit.modbus.coilStatus"/></option>
-              <option value="<c:out value="<%= RegisterRange.INPUT_STATUS %>"/>"><fmt:message key="dsEdit.modbus.inputStatus"/></option>
-              <option value="<c:out value="<%= RegisterRange.HOLDING_REGISTER %>"/>"><fmt:message key="dsEdit.modbus.holdingRegister"/></option>
-              <option value="<c:out value="<%= RegisterRange.INPUT_REGISTER %>"/>"><fmt:message key="dsEdit.modbus.inputRegister"/></option>
+              <option value="<c:out value="<%= RegisterRange.COIL_STATUS %>"/>"><spring:message code="dsEdit.modbus.coilStatus"/></option>
+              <option value="<c:out value="<%= RegisterRange.INPUT_STATUS %>"/>"><spring:message code="dsEdit.modbus.inputStatus"/></option>
+              <option value="<c:out value="<%= RegisterRange.HOLDING_REGISTER %>"/>"><spring:message code="dsEdit.modbus.holdingRegister"/></option>
+              <option value="<c:out value="<%= RegisterRange.INPUT_REGISTER %>"/>"><spring:message code="dsEdit.modbus.inputRegister"/></option>
             </select>
           </td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.modbusDataType"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.modbusDataType"/></td>
           <td class="formField">
             <select id="test_modbusDataType" onchange="changeDataType('test_')">
-              <option value="<c:out value="<%= DataType.BINARY %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.binary"/></option>
-              <option value="<c:out value="<%= DataType.TWO_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.2bUnsigned"/></option>
-              <option value="<c:out value="<%= DataType.TWO_BYTE_INT_SIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.2bSigned"/></option>
-              <option value="<c:out value="<%= DataType.TWO_BYTE_BCD %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.2bBcd"/></option>
-              <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bUnsigned"/></option>
-              <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_SIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bSigned"/></option>
-              <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_UNSIGNED_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bUnsignedSwapped"/></option>
-              <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_SIGNED_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bSignedSwapped"/></option>
-              <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bFloat"/></option>
-              <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bFloatSwapped"/></option>
-              <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT_SWAPPED_INVERTED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bFloatSwappedInverted"/></option>            
-              <option value="<c:out value="<%= DataType.FOUR_BYTE_BCD %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bBcd"/></option>
-              <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bUnsigned"/></option>
-              <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_SIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bSigned"/></option>
-              <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_UNSIGNED_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bUnsignedSwapped"/></option>
-              <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_SIGNED_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bSignedSwapped"/></option>
-              <option value="<c:out value="<%= DataType.EIGHT_BYTE_FLOAT %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bFloat"/></option>
-              <option value="<c:out value="<%= DataType.EIGHT_BYTE_FLOAT_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bFloatSwapped"/></option>
-              <option value="<c:out value="<%= DataType.CHAR %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.char"/></option>
-              <option value="<c:out value="<%= DataType.VARCHAR %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.varchar"/></option>
+              <option value="<c:out value="<%= DataType.BINARY %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.binary"/></option>
+              <option value="<c:out value="<%= DataType.TWO_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.2bUnsigned"/></option>
+              <option value="<c:out value="<%= DataType.TWO_BYTE_INT_SIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.2bSigned"/></option>
+              <option value="<c:out value="<%= DataType.TWO_BYTE_BCD %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.2bBcd"/></option>
+              <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bUnsigned"/></option>
+              <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_SIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bSigned"/></option>
+              <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_UNSIGNED_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bUnsignedSwapped"/></option>
+              <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_SIGNED_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bSignedSwapped"/></option>
+              <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bFloat"/></option>
+              <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bFloatSwapped"/></option>
+              <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT_SWAPPED_INVERTED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bFloatSwappedInverted"/></option>
+              <option value="<c:out value="<%= DataType.FOUR_BYTE_BCD %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bBcd"/></option>
+              <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bUnsigned"/></option>
+              <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_SIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bSigned"/></option>
+              <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_UNSIGNED_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bUnsignedSwapped"/></option>
+              <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_SIGNED_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bSignedSwapped"/></option>
+              <option value="<c:out value="<%= DataType.EIGHT_BYTE_FLOAT %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bFloat"/></option>
+              <option value="<c:out value="<%= DataType.EIGHT_BYTE_FLOAT_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bFloatSwapped"/></option>
+              <option value="<c:out value="<%= DataType.CHAR %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.char"/></option>
+              <option value="<c:out value="<%= DataType.VARCHAR %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.varchar"/></option>
             </select>
           </td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.offset"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.offset"/></td>
           <td class="formField"><input type="text" id="test_offset" value="0"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.bit"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.bit"/></td>
           <td class="formField"><input id="test_bit" type="text" value="0"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.registerCount"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.registerCount"/></td>
           <td class="formField"><input id="test_registerCount" type="text" value="0"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.charset"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.modbus.charset"/></td>
           <td class="formField"><input id="test_charset" type="text" value="ASCII"/></td>
         </tr>
         
         <tr>
           <td colspan="2" align="center">
-            <input id="locatorTestBtn" type="button" value="<fmt:message key="dsEdit.modbus.locatorTest.test"/>" onclick="locatorTest();"/>
-            <input type="button" value="<fmt:message key="dsEdit.modbus.addPoint"/>" onclick="addPoint();"/>
+            <input id="locatorTestBtn" type="button" value="<spring:message code="dsEdit.modbus.locatorTest.test"/>" onclick="locatorTest();"/>
+            <input type="button" value="<spring:message code="dsEdit.modbus.addPoint"/>" onclick="addPoint();"/>
           </td>
         </tr>
         
@@ -586,83 +586,83 @@
 
 <tag:pointList pointHelpId="modbusPP">
   <tr id="slaveIdRow">
-    <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.slaveId"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.modbus.slaveId"/></td>
     <td class="formField"><input type="text" id="slaveId"/></td>
   </tr>
   
   <tbody id="nonSlaveMonitor">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.registerRange"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.modbus.registerRange"/></td>
       <td class="formField">
         <select id="range" onchange="changeRange('')">
-          <option value="<c:out value="<%= RegisterRange.COIL_STATUS %>"/>"><fmt:message key="dsEdit.modbus.coilStatus"/></option>
-          <option value="<c:out value="<%= RegisterRange.INPUT_STATUS %>"/>"><fmt:message key="dsEdit.modbus.inputStatus"/></option>
-          <option value="<c:out value="<%= RegisterRange.HOLDING_REGISTER %>"/>"><fmt:message key="dsEdit.modbus.holdingRegister"/></option>
-          <option value="<c:out value="<%= RegisterRange.INPUT_REGISTER %>"/>"><fmt:message key="dsEdit.modbus.inputRegister"/></option>
+          <option value="<c:out value="<%= RegisterRange.COIL_STATUS %>"/>"><spring:message code="dsEdit.modbus.coilStatus"/></option>
+          <option value="<c:out value="<%= RegisterRange.INPUT_STATUS %>"/>"><spring:message code="dsEdit.modbus.inputStatus"/></option>
+          <option value="<c:out value="<%= RegisterRange.HOLDING_REGISTER %>"/>"><spring:message code="dsEdit.modbus.holdingRegister"/></option>
+          <option value="<c:out value="<%= RegisterRange.INPUT_REGISTER %>"/>"><spring:message code="dsEdit.modbus.inputRegister"/></option>
         </select>
       </td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.modbusDataType"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.modbus.modbusDataType"/></td>
       <td class="formField">
         <select id="modbusDataType" onchange="changeDataType('')">
-          <option value="<c:out value="<%= DataType.BINARY %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.binary"/></option>
-          <option value="<c:out value="<%= DataType.TWO_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.2bUnsigned"/></option>
-          <option value="<c:out value="<%= DataType.TWO_BYTE_INT_SIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.2bSigned"/></option>
-          <option value="<c:out value="<%= DataType.TWO_BYTE_BCD %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.2bBcd"/></option>
-          <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bUnsigned"/></option>
-          <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_SIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bSigned"/></option>
-          <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_UNSIGNED_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bUnsignedSwapped"/></option>
-          <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_SIGNED_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bSignedSwapped"/></option>
-          <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bFloat"/></option>
-          <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bFloatSwapped"/></option>
-          <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT_SWAPPED_INVERTED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bFloatSwappedInverted"/></option>            
-          <option value="<c:out value="<%= DataType.FOUR_BYTE_BCD %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.4bBcd"/></option>
-          <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bUnsigned"/></option>
-          <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_SIGNED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bSigned"/></option>
-          <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_UNSIGNED_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bUnsignedSwapped"/></option>
-          <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_SIGNED_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bSignedSwapped"/></option>
-          <option value="<c:out value="<%= DataType.EIGHT_BYTE_FLOAT %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bFloat"/></option>
-          <option value="<c:out value="<%= DataType.EIGHT_BYTE_FLOAT_SWAPPED %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.8bFloatSwapped"/></option>
-          <option value="<c:out value="<%= DataType.CHAR %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.char"/></option>
-          <option value="<c:out value="<%= DataType.VARCHAR %>"/>"><fmt:message key="dsEdit.modbus.modbusDataType.varchar"/></option>
+          <option value="<c:out value="<%= DataType.BINARY %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.binary"/></option>
+          <option value="<c:out value="<%= DataType.TWO_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.2bUnsigned"/></option>
+          <option value="<c:out value="<%= DataType.TWO_BYTE_INT_SIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.2bSigned"/></option>
+          <option value="<c:out value="<%= DataType.TWO_BYTE_BCD %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.2bBcd"/></option>
+          <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bUnsigned"/></option>
+          <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_SIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bSigned"/></option>
+          <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_UNSIGNED_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bUnsignedSwapped"/></option>
+          <option value="<c:out value="<%= DataType.FOUR_BYTE_INT_SIGNED_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bSignedSwapped"/></option>
+          <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bFloat"/></option>
+          <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bFloatSwapped"/></option>
+          <option value="<c:out value="<%= DataType.FOUR_BYTE_FLOAT_SWAPPED_INVERTED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bFloatSwappedInverted"/></option>
+          <option value="<c:out value="<%= DataType.FOUR_BYTE_BCD %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.4bBcd"/></option>
+          <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bUnsigned"/></option>
+          <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_SIGNED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bSigned"/></option>
+          <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_UNSIGNED_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bUnsignedSwapped"/></option>
+          <option value="<c:out value="<%= DataType.EIGHT_BYTE_INT_SIGNED_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bSignedSwapped"/></option>
+          <option value="<c:out value="<%= DataType.EIGHT_BYTE_FLOAT %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bFloat"/></option>
+          <option value="<c:out value="<%= DataType.EIGHT_BYTE_FLOAT_SWAPPED %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.8bFloatSwapped"/></option>
+          <option value="<c:out value="<%= DataType.CHAR %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.char"/></option>
+          <option value="<c:out value="<%= DataType.VARCHAR %>"/>"><spring:message code="dsEdit.modbus.modbusDataType.varchar"/></option>
         </select>
       </td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.offset"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.modbus.offset"/></td>
       <td class="formField"><input type="text" id="offset"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.bit"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.modbus.bit"/></td>
       <td class="formField"><input id="bit" type="text"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.registerCount"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.modbus.registerCount"/></td>
       <td class="formField"><input id="registerCount" type="text"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.charset"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.modbus.charset"/></td>
       <td class="formField"><input id="charset" type="text"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.modbus.settableOverride"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.modbus.settableOverride"/></td>
       <td class="formField"><input id="settableOverride" type="checkbox"/></td>
     </tr>
     
     <tr>
-      <td class="formLabel"><fmt:message key="dsEdit.modbus.multiplier"/></td>
+      <td class="formLabel"><spring:message code="dsEdit.modbus.multiplier"/></td>
       <td class="formField"><input type="text" id="multiplier"/></td>
     </tr>
     
     <tr>
-      <td class="formLabel"><fmt:message key="dsEdit.modbus.additive"/></td>
+      <td class="formLabel"><spring:message code="dsEdit.modbus.additive"/></td>
       <td class="formField"><input type="text" id="additive"/></td>
     </tr>
   </tbody>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editModbusIp.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editModbusIp.jsp
index b2d1586e02..28cf29a0cd 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editModbusIp.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editModbusIp.jsp
@@ -61,14 +61,14 @@
 
       let messages = [];
 
-      validateValue("updatePeriods", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, temp.updatePeriods, messages);
-      validateValue("updatePeriodType", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, temp.updatePeriodType, messages);
-      validateValue("timeout", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, temp.timeout, messages);
-      validateValue("retries", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, temp.retries, messages);
-      validateValue("maxReadBitCount", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, temp.maxReadBitCount, messages);
-      validateValue("maxReadRegisterCount", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, temp.maxReadRegisterCount, messages);
-      validateValue("maxWriteRegisterCount", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, temp.maxWriteRegisterCount, messages);
-      validateValue("port", "<fmt:message key='badIntegerFormat'/>", isPositiveInt, temp.port, messages);
+      validateValue("updatePeriods", "<spring:message code='badIntegerFormat'/>", isPositiveInt, temp.updatePeriods, messages);
+      validateValue("updatePeriodType", "<spring:message code='badIntegerFormat'/>", isPositiveInt, temp.updatePeriodType, messages);
+      validateValue("timeout", "<spring:message code='badIntegerFormat'/>", isPositiveInt, temp.timeout, messages);
+      validateValue("retries", "<spring:message code='badIntegerFormat'/>", isPositiveInt, temp.retries, messages);
+      validateValue("maxReadBitCount", "<spring:message code='badIntegerFormat'/>", isPositiveInt, temp.maxReadBitCount, messages);
+      validateValue("maxReadRegisterCount", "<spring:message code='badIntegerFormat'/>", isPositiveInt, temp.maxReadRegisterCount, messages);
+      validateValue("maxWriteRegisterCount", "<spring:message code='badIntegerFormat'/>", isPositiveInt, temp.maxWriteRegisterCount, messages);
+      validateValue("port", "<spring:message code='badIntegerFormat'/>", isPositiveInt, temp.port, messages);
 
       return messages;
   }
@@ -131,33 +131,33 @@
 </script>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusIp.transportType"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusIp.transportType"/></td>
   <td class="formField">
     <sst:select id="transportType" value="${dataSource.transportType}" onchange="checkTransportType(this.value)">
-      <sst:option value="<%= ModbusIpDataSourceVO.TransportType.TCP.toString() %>"><fmt:message key="dsEdit.modbusIp.transportType.tcp"/></sst:option>
-      <sst:option value="<%= ModbusIpDataSourceVO.TransportType.TCP_KEEP_ALIVE.toString() %>"><fmt:message key="dsEdit.modbusIp.transportType.tcpKA"/></sst:option>
-      <sst:option value="<%= ModbusIpDataSourceVO.TransportType.UDP.toString() %>"><fmt:message key="dsEdit.modbusIp.transportType.udp"/></sst:option>
-      <sst:option value="<%= ModbusIpDataSourceVO.TransportType.TCP_LISTENER.toString() %>"><fmt:message key="dsEdit.modbusIp.transportType.tcpListener"/></sst:option>
+      <sst:option value="<%= ModbusIpDataSourceVO.TransportType.TCP.toString() %>"><spring:message code="dsEdit.modbusIp.transportType.tcp"/></sst:option>
+      <sst:option value="<%= ModbusIpDataSourceVO.TransportType.TCP_KEEP_ALIVE.toString() %>"><spring:message code="dsEdit.modbusIp.transportType.tcpKA"/></sst:option>
+      <sst:option value="<%= ModbusIpDataSourceVO.TransportType.UDP.toString() %>"><spring:message code="dsEdit.modbusIp.transportType.udp"/></sst:option>
+      <sst:option value="<%= ModbusIpDataSourceVO.TransportType.TCP_LISTENER.toString() %>"><spring:message code="dsEdit.modbusIp.transportType.tcpListener"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusIp.host"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusIp.host"/></td>
   <td class="formField"><input id="host" type="text" value="${dataSource.host}"/></td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusIp.port"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusIp.port"/></td>
   <td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusIp.encapsulated"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusIp.encapsulated"/></td>
   <td class="formField"><sst:checkbox id="encapsulated" selectedValue="${dataSource.encapsulated}"/></td>
 </tr>
 
 <tr id="socketMonitorRow">
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusIp.createSocketMonitorPoint"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusIp.createSocketMonitorPoint"/></td>
   <td class="formField"><sst:checkbox id="createSocketMonitorPoint" selectedValue="${dataSource.createSocketMonitorPoint}"/></td>
 </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editModbusSerial.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editModbusSerial.jsp
index 5207bd058b..e95150a2c4 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editModbusSerial.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editModbusSerial.jsp
@@ -50,7 +50,7 @@
 </script>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.port"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.port"/></td>
   <td class="formField">
     <c:choose>
       <c:when test="${!empty commPortError}">
@@ -69,7 +69,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.baud"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.baud"/></td>
   <td class="formField">
     <sst:select id="baudRate" value="${dataSource.baudRate}">
       <sst:option>110</sst:option>
@@ -90,29 +90,29 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.flowIn"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.flowIn"/></td>
   <td class="formField">
     <sst:select id="flowControlIn" value="${dataSource.flowControlIn}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.flow.none"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.modbusSerial.flow.rtsCts"/></sst:option>
-      <sst:option value="4"><fmt:message key="dsEdit.modbusSerial.flow.xonXoff"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.flow.none"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.modbusSerial.flow.rtsCts"/></sst:option>
+      <sst:option value="4"><spring:message code="dsEdit.modbusSerial.flow.xonXoff"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.flowOut"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.flowOut"/></td>
   <td class="formField">
     <sst:select id="flowControlOut" value="${dataSource.flowControlOut}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.flow.none"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.modbusSerial.flow.rtsCts"/></sst:option>
-      <sst:option value="8"><fmt:message key="dsEdit.modbusSerial.flow.xonXoff"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.flow.none"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.modbusSerial.flow.rtsCts"/></sst:option>
+      <sst:option value="8"><spring:message code="dsEdit.modbusSerial.flow.xonXoff"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.dataBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.dataBits"/></td>
   <td class="formField">
     <sst:select id="dataBits" value="${dataSource.dataBits}">
       <sst:option value="5">5</sst:option>
@@ -124,7 +124,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.stopBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.stopBits"/></td>
   <td class="formField">
     <sst:select id="stopBits" value="${dataSource.stopBits}">
       <sst:option value="1">1</sst:option>
@@ -135,45 +135,45 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.parity"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.parity"/></td>
   <td class="formField">
     <sst:select id="parity" value="${dataSource.parity}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.parity.none"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.modbusSerial.parity.odd"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.modbusSerial.parity.even"/></sst:option>
-      <sst:option value="3"><fmt:message key="dsEdit.modbusSerial.parity.mark"/></sst:option>
-      <sst:option value="4"><fmt:message key="dsEdit.modbusSerial.parity.space"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.parity.none"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.modbusSerial.parity.odd"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.modbusSerial.parity.even"/></sst:option>
+      <sst:option value="3"><spring:message code="dsEdit.modbusSerial.parity.mark"/></sst:option>
+      <sst:option value="4"><spring:message code="dsEdit.modbusSerial.parity.space"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.encoding"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.encoding"/></td>
   <td class="formField">
     <sst:select id="encoding" value="${dataSource.encoding}">
-      <sst:option value="<%= ModbusSerialDataSourceVO.EncodingType.RTU.toString() %>"><fmt:message key="dsEdit.modbusSerial.encoding.rtu"/></sst:option>
-      <sst:option value="<%= ModbusSerialDataSourceVO.EncodingType.ASCII.toString() %>"><fmt:message key="dsEdit.modbusSerial.encoding.ascii"/></sst:option>
+      <sst:option value="<%= ModbusSerialDataSourceVO.EncodingType.RTU.toString() %>"><spring:message code="dsEdit.modbusSerial.encoding.rtu"/></sst:option>
+      <sst:option value="<%= ModbusSerialDataSourceVO.EncodingType.ASCII.toString() %>"><spring:message code="dsEdit.modbusSerial.encoding.ascii"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.echo"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.echo"/></td>
   <td class="formField">
     <sst:select id="echo" value="${dataSource.echo}">
-      <sst:option value="false"><fmt:message key="dsEdit.modbusSerial.echo.off"/></sst:option>
-      <sst:option value="true"><fmt:message key="dsEdit.modbusSerial.echo.on"/></sst:option>
+      <sst:option value="false"><spring:message code="dsEdit.modbusSerial.echo.off"/></sst:option>
+      <sst:option value="true"><spring:message code="dsEdit.modbusSerial.echo.on"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.modbusSerial.concurrency"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.modbusSerial.concurrency"/></td>
   <td class="formField">
     <sst:select id="concurrency" value="${dataSource.concurrency}">
-      <sst:option value="<%= Integer.toString(SerialMaster.SYNC_TRANSPORT) %>"><fmt:message key="dsEdit.modbusSerial.concurrency.transport"/></sst:option>
-      <sst:option value="<%= Integer.toString(SerialMaster.SYNC_SLAVE) %>"><fmt:message key="dsEdit.modbusSerial.concurrency.slave"/></sst:option>
-      <sst:option value="<%= Integer.toString(SerialMaster.SYNC_FUNCTION) %>"><fmt:message key="dsEdit.modbusSerial.concurrency.function"/></sst:option>
+      <sst:option value="<%= Integer.toString(SerialMaster.SYNC_TRANSPORT) %>"><spring:message code="dsEdit.modbusSerial.concurrency.transport"/></sst:option>
+      <sst:option value="<%= Integer.toString(SerialMaster.SYNC_SLAVE) %>"><spring:message code="dsEdit.modbusSerial.concurrency.slave"/></sst:option>
+      <sst:option value="<%= Integer.toString(SerialMaster.SYNC_FUNCTION) %>"><spring:message code="dsEdit.modbusSerial.concurrency.function"/></sst:option>
     </sst:select>
   </td>
 </tr>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editMqtt.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editMqtt.jsp
index e201dfedac..2fb677eff7 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editMqtt.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editMqtt.jsp
@@ -38,7 +38,7 @@
         if(isValid(dataSourceToSave.updateAttempts)) {
             DataSourceEditDwr.saveMqttDataSource(dataSourceToSave, saveDataSourceCB);
         } else {
-            let message = createValidationMessage("updateAttempts","<fmt:message key="badIntegerFormat"/>");
+            let message = createValidationMessage("updateAttempts","<spring:message code="badIntegerFormat"/>");
             showDwrMessages([message]);
             stopImageFader("dsSaveImg");
         }
@@ -69,11 +69,11 @@
 </script>
 
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.mqtt.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.mqtt.desc"/></c:set>
 <c:set var="dsHelpId" value="mqttDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -82,27 +82,27 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.updateAttempts"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.messaging.updateAttempts"/></td>
     <td class="formField"><input type="text" id="updateAttempts" value="${dataSource.updateAttempts}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serverHost"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serverHost"/></td>
     <td class="formField"><input type="text" id="serverHost" value="${dataSource.serverHost}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serverPortNumber"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serverPortNumber"/></td>
     <td class="formField"><input type="number" id="serverPortNumber" value="${dataSource.serverPortNumber}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serverUsername"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serverUsername"/></td>
     <td class="formField"><input type="text" id="serverUsername" value="${dataSource.serverUsername}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.serverPassword"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.serverPassword"/></td>
     <td class="formField"><input type="text" id="serverPassword" value="${dataSource.serverPassword}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.protocolVersion"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.messaging.protocolVersion"/></td>
     <td class="formField">
         <select id="protocolVersion">
             <option value="<c:out value="<%= MqttVersion.V3_1_1_MQTT %>"/>" ${dataSource.protocolVersion.name == 'V3_1_1_MQTT' ? 'selected' : ''} ><c:out value='<%= MqttVersion.V3_1_1_MQTT.getVersion() %>'/></option>
@@ -111,7 +111,7 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.brokerMode"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.messaging.brokerMode"/></td>
     <td class="formField">
         <select id="brokerMode">
             <option value="<c:out value="<%= BrokerMode.NATIVE %>"/>" ${dataSource.brokerMode == 'NATIVE' ? 'selected' : ''} >Native</option>
@@ -119,27 +119,27 @@
     </td>
   </tr>
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.mqtt.cleanSession"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.mqtt.cleanSession"/></td>
       <td class="formField"><input type="checkbox" id="cleanSession" ${dataSource.cleanSession ? 'checked' : 'unchecked'} /></td>
     </tr>
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.mqtt.keepAliveInterval"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.mqtt.keepAliveInterval"/></td>
       <td class="formField"><input type="number" id="keepAliveInterval" value="${dataSource.keepAliveInterval}"/></td>
     </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.connectionTimeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.connectionTimeout"/></td>
     <td class="formField"><input type="number" id="connectionTimeout" value="${dataSource.connectionTimeout}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.mqtt.executorServiceTimeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.mqtt.executorServiceTimeout"/></td>
     <td class="formField"><input type="number" id="executorServiceTimeout" value="${dataSource.executorServiceTimeout}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.mqtt.automaticReconnect"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.mqtt.automaticReconnect"/></td>
     <td class="formField"><input type="checkbox" id="automaticReconnect" ${dataSource.automaticReconnect ? 'checked' : 'unchecked'} /></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.mqtt.maxReconnectDelay"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.mqtt.maxReconnectDelay"/></td>
     <td class="formField"><input type="number" id="maxReconnectDelay" value="${dataSource.maxReconnectDelay}"/></td>
   </tr>
 
@@ -148,16 +148,16 @@
 <tag:pointList pointHelpId="mqttPP">
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.settable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.settable"/></td>
     <td class="formField"><input type="checkbox" id="settable"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.writable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.writable"/></td>
     <td class="formField"><input type="checkbox" id="writable"/></td>
    </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId">
         <tag:dataTypeOptions excludeMultistate="true" excludeImage="true" />
@@ -165,19 +165,19 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.clientId"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.messaging.clientId"/></td>
     <td class="formField"><input type="text" id="clientId"/></td>
   </tr>
   <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.mqtt.topicFilter"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.mqtt.topicFilter"/></td>
       <td class="formField"><input type="text" id="topicFilter"/></td>
   </tr>
   <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.messaging.qos"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.messaging.qos"/></td>
       <td class="formField"><input type="number" id="qos"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.mqtt.retained"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.mqtt.retained"/></td>
       <td class="formField"><input type="checkbox" id="retained"/></td>
   </tr>
 </tag:pointList>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editNmea.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editNmea.jsp
index 60e3f8f937..aa95c0835c 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editNmea.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editNmea.jsp
@@ -31,7 +31,7 @@
   }
   
   function listen() {
-      $set("listenMessage", "<fmt:message key="dsEdit.nmea.listening"/>");
+      $set("listenMessage", "<spring:message code="dsEdit.nmea.listening"/>");
       dwr.util.removeAllRows("messagesList");
       listenButtons(true);
       DataSourceEditDwr.nmeaListenForMessages($get("commPortId"), $get("baudRate"), listenCB);
@@ -59,16 +59,16 @@
   function listenCancel() {
       DataSourceEditDwr.cancelTestingUtility(function() {
           listenButtons(false);
-          $("listenMessage").innerHTML = "<fmt:message key="common.cancelled"/>";
+          $("listenMessage").innerHTML = "<spring:message code="common.cancelled"/>";
       });
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.nmea.messageName"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.nmea.messageName"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
           function(p) { return encodeHtml(p.pointLocator.messageName); };
       
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.nmea.fieldIndex"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.nmea.fieldIndex"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
           function(p) { return p.pointLocator.fieldIndex; };
   }
@@ -101,11 +101,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.nmea.props"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.nmea.props"/></c:set>
 <c:set var="dsHelpId" value="nmeaListenerDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.nmea.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.nmea.port"/></td>
           <td class="formField">
             <c:choose>
               <c:when test="${!empty commPortError}">
@@ -124,7 +124,7 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.nmea.baud"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.nmea.baud"/></td>
           <td class="formField">
             <sst:select id="baudRate" value="${dataSource.baudRate}">
               <sst:option>1200</sst:option>
@@ -136,7 +136,7 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.nmea.resetTimeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.nmea.resetTimeout"/></td>
           <td class="formField"><input type="text" id="resetTimeout" value="${dataSource.resetTimeout}"/></td>
         </tr>
       </table>
@@ -147,12 +147,12 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.nmea.listener"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.nmea.listener"/></td></tr>
         
         <tr>
           <td colspan="2">
-            <input id="listenBtn" type="button" value="<fmt:message key="dsEdit.nmea.listen"/>" onclick="listen();"/>
-            <input id="listenCancelBtn" type="button" value="<fmt:message key="common.cancel"/>" onclick="listenCancel();"/>
+            <input id="listenBtn" type="button" value="<spring:message code="dsEdit.nmea.listen"/>" onclick="listen();"/>
+            <input id="listenCancelBtn" type="button" value="<spring:message code="common.cancel"/>" onclick="listenCancel();"/>
           </td>
         </tr>
         
@@ -165,7 +165,7 @@
 
 <tag:pointList pointHelpId="nmeaListenerPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select name="dataTypeId" onchange="dataTypeChanged()">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -174,17 +174,17 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.nmea.binary0Value"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.nmea.binary0Value"/></td>
     <td class="formField"><input type="text" id="binary0Value"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.nmea.messageName"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.nmea.messageName"/></td>
     <td class="formField"><input type="text" id="messageName"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.nmea.fieldIndex"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.nmea.fieldIndex"/></td>
     <td class="formField"><input type="text" id="fieldIndex"/></td>
   </tr>
 </tag:pointList>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editNodaveS7.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editNodaveS7.jsp
index 661b4e31ea..2e12ab1ab5 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editNodaveS7.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editNodaveS7.jsp
@@ -76,7 +76,7 @@
 	  if(exists) {
 		  alert('Arquivo OK!');
 	  } else {
-		  alert('Arquivo n�o encontrado!');
+		  alert('Arquivo n�o encontrado!');
 	  }
   }	
   
@@ -126,11 +126,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.nodaves7.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.nodaves7.desc"/></c:set>
 <c:set var="dsHelpId" value="asciiFileReaderDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -139,26 +139,26 @@
     </td>
   </tr>
   <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.quantize"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.quantize"/></td>
           <td class="formField"><sst:checkbox id="quantize" selectedValue="${dataSource.quantize}"/></td>
   </tr>
   <tr>
-	<td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.filePath"/></td>
+	<td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.filePath"/></td>
   	<td class="formField"><input id="filePath" type="text" value="${dataSource.filePath}"/></td>
 
   	<td>
-		<input id="checkBtn" type="button" value="<fmt:message key="dsEdit.asciiFile.checkFile"/>" onclick="checkFile();" />
+		<input id="checkBtn" type="button" value="<spring:message code="dsEdit.asciiFile.checkFile"/>" onclick="checkFile();" />
 	</td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.nodaves7.writeBaseCmd"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.nodaves7.writeBaseCmd"/></td>
    	<td class="formField"><input id="nodaveWriteBaseCmd" type="text" value="${dataSource.nodaveWriteBaseCmd}"/></td>
   </tr>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsEventsFoot.jspf" %>
 
 <tag:pointList pointHelpId="asciiFileReaderPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -166,52 +166,52 @@
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.valueRegex"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.valueRegex"/></td>
     <td class="formField">
     	<input id="valueRegex" type="text" value=""/>
     	<select id="valueSuggestions" onchange="valueSuggestChanged();">
     		<option value=""> &nbsp; </option>
-        	<option value="((\b[0-9]+)?\.)?[0-9]+\b"> <fmt:message key="dsEdit.asciiFile.regex.number"/>  </option>
+        	<option value="((\b[0-9]+)?\.)?[0-9]+\b"> <spring:message code="dsEdit.asciiFile.regex.number"/>  </option>
       	</select>
     </td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampCheck"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampCheck"/></td>
     <td class="formField"><input id="customTimestamp" type="checkbox" onchange="checkTimestampChanged();"/></td>
   </tr>
    	<tr>
-    	<td class="formLabelRequired"><fmt:message key="dsEdit.settable" /></td>
+    	<td class="formLabelRequired"><spring:message code="dsEdit.settable" /></td>
     	<td class="formField"><input id="settable" type="checkbox" ></td>
   	</tr>
   
   	  <tr>
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.nodaves7.s7writeMemoryArea"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.nodaves7.s7writeMemoryArea"/></td>
 	    <td class="formField">
 	    	<input id="s7writeMemoryArea" type="text" value=""/>
 	    </td> 
 	  <tr>
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.nodaves7.s7writeDBNUM"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.nodaves7.s7writeDBNUM"/></td>
 	    <td class="formField">
 	    	<input id="s7writeDBNUM" type="text" value=""/>
 	    </td> 
 	  <tr>
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.nodaves7.s7writeStarts"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.nodaves7.s7writeStarts"/></td>
 	    <td class="formField">
 	    	<input id="s7writeStarts" type="text" value=""/>
 	    </td> 
 	  <tr>
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.nodaves7.s7writeBytesQty"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.nodaves7.s7writeBytesQty"/></td>
 	    <td class="formField">
 	    	<input id="s7writeBytesQty" type="text" value=""/>
 	    </td> 
 	  <tr>
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.nodaves7.s7writeBitOffset"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.nodaves7.s7writeBitOffset"/></td>
 	    <td class="formField">
 	    	<input id="s7writeBitOffset" type="text" value=""/>
 	    </td> 
 
 	  <tr id="tsDiv1">
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampFormat"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampFormat"/></td>
 	    <td class="formField">
 	    	<input id="timestampFormat" type="text" value=""/>
 	    	<select id="timestampSuggestions" onchange="timestampSuggestChanged();">
@@ -224,7 +224,7 @@
 	    </td>
 	  </tr>
 	  <tr id="tsDiv2">
-	    <td class="formLabelRequired"><fmt:message key="dsEdit.asciiFile.timestampRegex"/></td>
+	    <td class="formLabelRequired"><spring:message code="dsEdit.asciiFile.timestampRegex"/></td>
 	    <td class="formField">
 	    	<input id="timestampRegex" type="text" value=""/>
 	    </td> 
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editOneWire.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editOneWire.jsp
index ef50c4ec8f..af2eed3b8f 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editOneWire.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editOneWire.jsp
@@ -34,7 +34,7 @@
   
   function getNetworkInfo() {
       setDisabled("scanBtn", true);
-      showMessage("scanMessage", "<fmt:message key="dsEdit.1wire.scanning"/>");
+      showMessage("scanMessage", "<spring:message code="dsEdit.1wire.scanning"/>");
       hide("scanResults");
       DataSourceEditDwr.readOneWireNetwork($get("commPortId"), getNetworkInfoCB);
   }
@@ -49,7 +49,7 @@
       }
       else {
           // Show the results of the scan
-          showMessage("scanMessage", "<fmt:message key="dsEdit.1wire.scanComplete"/>");
+          showMessage("scanMessage", "<spring:message code="dsEdit.1wire.scanComplete"/>");
           networkInfo = result.data.devices;
           
           dwr.util.removeAllRows("scanDevices");
@@ -58,7 +58,7 @@
                       function(device) { return device.description; },
                       function(device) {
                           return writeImage("scanDeviceImg"+ device.addressString, null, "icon_comp_add",
-                                  "<fmt:message key="common.add"/>", "addPoint('"+ device.addressString +"')");
+                                  "<spring:message code="common.add"/>", "addPoint('"+ device.addressString +"')");
                           }
                   ],
                   {
@@ -88,10 +88,10 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.1wire.address"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.1wire.address"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.address; };
       
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.1wire.attribute"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.1wire.attribute"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = 
               function(p) { return p.pointLocator.attributeIndexDescription; };
   }
@@ -102,7 +102,7 @@
   
   function editPointCBImpl(locator) {
       if (!networkInfo) {
-          alert("<fmt:message key="dsEdit.1wire.scanWarn"/>");
+          alert("<spring:message code="dsEdit.1wire.scanWarn"/>");
           return true;
       }
       
@@ -168,13 +168,13 @@
           hide("indexRow");
       else {
           if (attributeId == <%= OneWirePointLocatorVO.AttributeTypes.AD_VOLTAGE %>)
-              $set("indexLabel", "<fmt:message key="dsEdit.1wire.attribute.adChannel"/>");
+              $set("indexLabel", "<spring:message code="dsEdit.1wire.attribute.adChannel"/>");
           else if (attributeId == <%= OneWirePointLocatorVO.AttributeTypes.LATCH_STATE %>)
-              $set("indexLabel", "<fmt:message key="dsEdit.1wire.attribute.channel"/>");
+              $set("indexLabel", "<spring:message code="dsEdit.1wire.attribute.channel"/>");
           else if (attributeId == <%= OneWirePointLocatorVO.AttributeTypes.WIPER_POSITION %>)
-              $set("indexLabel", "<fmt:message key="dsEdit.1wire.attribute.wiper"/>");
+              $set("indexLabel", "<spring:message code="dsEdit.1wire.attribute.wiper"/>");
           else if (attributeId == <%= OneWirePointLocatorVO.AttributeTypes.COUNTER %>)
-              $set("indexLabel", "<fmt:message key="dsEdit.1wire.attribute.counter"/>");
+              $set("indexLabel", "<spring:message code="dsEdit.1wire.attribute.counter"/>");
           
           var indexSel = $("index");
           for (var i=0; i<length; i++)
@@ -192,11 +192,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.1wire.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.1wire.desc"/></c:set>
 <c:set var="dsHelpId" value="1wireDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.1wire.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.1wire.port"/></td>
           <td class="formField">
             <c:choose>
               <c:when test="${!empty commPortError}">
@@ -215,7 +215,7 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -225,11 +225,11 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.1wire.scheduledRescan"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.1wire.scheduledRescan"/></td>
           <td class="formField">
             <input type="text" id="rescanPeriods" value="${dataSource.rescanPeriods}" class="formShort"/>
             <sst:select id="rescanPeriodType" value="${dataSource.rescanPeriodType}" onchange="rescanChanged()">
-              <sst:option value="<%= Integer.toString(OneWireDataSourceVO.RESCAN_NONE) %>"><fmt:message key="dsEdit.1wire.none"/></sst:option>
+              <sst:option value="<%= Integer.toString(OneWireDataSourceVO.RESCAN_NONE) %>"><spring:message code="dsEdit.1wire.none"/></sst:option>
               <tag:timePeriodOptions sst="true" min="true" h="true" d="true" w="true"/>
             </sst:select>
           </td>
@@ -242,22 +242,22 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td class="smallTitle"><fmt:message key="dsEdit.1wire.scan"/></td></tr>
+        <tr><td class="smallTitle"><spring:message code="dsEdit.1wire.scan"/></td></tr>
         
         <tr>
           <td align="center">
-            <input id="scanBtn" type="button" value="<fmt:message key="dsEdit.1wire.runScan"/>" onclick="getNetworkInfo();"/>
+            <input id="scanBtn" type="button" value="<spring:message code="dsEdit.1wire.runScan"/>" onclick="getNetworkInfo();"/>
           </td>
         </tr>
         
         <tr><td id="scanMessage" style="display:none;" class="formError"></td></tr>
         <tbody id="scanResults" style="display:none;"><tr><td><table cellspacing="1">
           <tr class="rowHeader">
-            <td><fmt:message key="dsEdit.1wire.address"/></td>
-            <td><fmt:message key="dsEdit.1wire.description"/></td>
+            <td><spring:message code="dsEdit.1wire.address"/></td>
+            <td><spring:message code="dsEdit.1wire.description"/></td>
             <td></td>
           </tr>
-          <tbody id="scanDevicesNoneFound"><td colspan="3"><fmt:message key="dsEdit.1wire.noDevices"/></td></tbody>
+          <tbody id="scanDevicesNoneFound"><td colspan="3"><spring:message code="dsEdit.1wire.noDevices"/></td></tbody>
           <tbody id="scanDevices"></tbody>
         </table></td></tr></tbody>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsFoot.jspf" %>
@@ -265,17 +265,17 @@
 <tag:pointList pointHelpId="1wirePP">
   <tbody id="editableAttributes">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.1wire.address"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.1wire.address"/></td>
       <td class="formField"><select id="address" onchange="addressChanged()"></select></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.1wire.deviceType"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.1wire.deviceType"/></td>
       <td class="formField"><input type="text" id="deviceType" disabled="disabled" class="formLong"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.1wire.attribute"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.1wire.attribute"/></td>
       <td class="formField"><select id="attributeId" onchange="attributeIdChanged()"></select></td>
     </tr>
   </tbody>
@@ -289,20 +289,20 @@
   
   <tbody id="readonlyAttributes">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.1wire.address"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.1wire.address"/></td>
       <td class="formField"><input type="text" id="roAddress" disabled="disabled"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.1wire.attribute"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.1wire.attribute"/></td>
       <td class="formField"><input type="text" id="roAttributeDescription" disabled="disabled"/></td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.1wire.index"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.1wire.index"/></td>
       <td class="formField"><input type="text" id="roIndex" disabled="disabled"/></td>
     </tr>
     
-    <tr><td colspan="2" class="formError"><fmt:message key="dsEdit.1wire.noInfo"/></td></tr>
+    <tr><td colspan="2" class="formError"><spring:message code="dsEdit.1wire.noInfo"/></td></tr>
   </tbody>
 </tag:pointList>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editOpc.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editOpc.jsp
index 3325cd8626..a2f23cb330 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editOpc.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editOpc.jsp
@@ -22,17 +22,17 @@
           function(data) { return data.tag; },
           function(data) {
               if (data.dataType == ${applicationScope['constants.DataTypes.BINARY']})
-                  return "<fmt:message key="common.dataTypes.binary"/>";
+                  return "<spring:message code="common.dataTypes.binary"/>";
               if (data.dataType == ${applicationScope['constants.DataTypes.MULTISTATE']})
-                  return "<fmt:message key="common.dataTypes.multistate"/>";
+                  return "<spring:message code="common.dataTypes.multistate"/>";
               if (data.dataType == ${applicationScope['constants.DataTypes.NUMERIC']})
-                  return "<fmt:message key="common.dataTypes.numeric"/>";
+                  return "<spring:message code="common.dataTypes.numeric"/>";
               if (data.dataType == ${applicationScope['constants.DataTypes.ALPHANUMERIC']})
-                  return "<fmt:message key="common.dataTypes.alphanumeric"/>";
+                  return "<spring:message code="common.dataTypes.alphanumeric"/>";
               if (data.dataType == 7)
-                      return "<fmt:message key="common.dataTypes.bad"/>";
+                      return "<spring:message code="common.dataTypes.bad"/>";
 
-              return "<fmt:message key="common.unknown"/> ("+ data.dataType +")";
+              return "<spring:message code="common.unknown"/> ("+ data.dataType +")";
           },
           function(data) { return data.settable; },
           function(data) { return "<input type='checkbox' name='addTag'/>"; }
@@ -114,15 +114,15 @@
 			  tags.push(list.rows[i].cells[0].innerHTML);
 			  
 			  // TODO Not good. What is put into innerHTML is not always what comes out.
-			  if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.dataTypes.binary"/>") {
+			  if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.dataTypes.binary"/>") {
 	           	  dataTypes.push(1);
-    		  } else if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.dataTypes.multistate"/>") {
+    		  } else if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.dataTypes.multistate"/>") {
     			  dataTypes.push(2);
-    		  } else if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.dataTypes.numeric"/>") {
+    		  } else if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.dataTypes.numeric"/>") {
     			  dataTypes.push(3);
-    		  } else if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.dataTypes.alphanumeric"/>") {
+    		  } else if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.dataTypes.alphanumeric"/>") {
     			  dataTypes.push(4);
-    		  } else if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.unknown"/>") {
+    		  } else if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.unknown"/>") {
     			  dataTypes.push(0);
     		  }
     		  
@@ -171,15 +171,15 @@
 			  tags.push(list.rows[i].cells[0].innerHTML);
 			  
 			  // TODO Not good. What is put into innerHTML is not always what comes out.
-			  if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.dataTypes.binary"/>") {
+			  if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.dataTypes.binary"/>") {
 	           	  dataTypes.push(1);
-    		  } else if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.dataTypes.multistate"/>") {
+    		  } else if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.dataTypes.multistate"/>") {
     			  dataTypes.push(2);
-    		  } else if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.dataTypes.numeric"/>") {
+    		  } else if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.dataTypes.numeric"/>") {
     			  dataTypes.push(3);
-    		  } else if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.dataTypes.alphanumeric"/>") {
+    		  } else if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.dataTypes.alphanumeric"/>") {
     			  dataTypes.push(4);
-    		  } else if (list.rows[i].cells[1].innerHTML == "<fmt:message key="common.unknown"/>") {
+    		  } else if (list.rows[i].cells[1].innerHTML == "<spring:message code="common.unknown"/>") {
     			  dataTypes.push(0);
     		  }
     		  
@@ -227,16 +227,16 @@
 				td2.setAttribute("align","center");
 				var text2 = "";
 				if(response.dataType == ${applicationScope['constants.DataTypes.BINARY']}){
-					text2 = document.createTextNode("<fmt:message key="common.dataTypes.binary"/>");
+					text2 = document.createTextNode("<spring:message code="common.dataTypes.binary"/>");
 				}
 				if(response.dataType == ${applicationScope['constants.DataTypes.NUMERIC']}){
-					text2 = document.createTextNode("<fmt:message key="common.dataTypes.numeric"/>");
+					text2 = document.createTextNode("<spring:message code="common.dataTypes.numeric"/>");
 				}
 				if(response.dataType == ${applicationScope['constants.DataTypes.ALPHANUMERIC']}){
-					text2 = document.createTextNode("<fmt:message key="common.dataTypes.alphanumeric"/>");
+					text2 = document.createTextNode("<spring:message code="common.dataTypes.alphanumeric"/>");
 				}
 				if(response.dataType == 6) {
-					text2 = document.createTextNode("<fmt:message key="common.unknown"/>");
+					text2 = document.createTextNode("<spring:message code="common.unknown"/>");
 				}
 				td2.appendChild(text2);
 
@@ -250,12 +250,12 @@
 
 	 			if (response.validate == true) {
 	 				img.setAttribute("src","images/accept.png");
-	 				img.setAttribute("title","<fmt:message key="dsEdit.opc.TagValidated"/>")
+	 				img.setAttribute("title","<spring:message code="dsEdit.opc.TagValidated"/>")
 	 				text3 = document.createTextNode("true");
 				}
 	 			else {
 	 				img.setAttribute("src","images/cancel.png");
-	 				img.setAttribute("title","<fmt:message key="dsEdit.opc.TagNotValidated"/>")
+	 				img.setAttribute("title","<spring:message code="dsEdit.opc.TagNotValidated"/>")
 	 				text3 = document.createTextNode("false");
 		 		}
 
@@ -295,44 +295,44 @@ function toggleDiv(elem) {
 --></script>
 
 <c:set var="dsDesc">
-	<fmt:message key="dsEdit.opc.desc" />
+	<spring:message code="dsEdit.opc.desc" />
 </c:set>
 <c:set var="dsHelpId" value="opcDS" />
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf"%>
 <tr>
-	<td class="formLabelRequired"><fmt:message key="dsEdit.opc.host" /></td>
+	<td class="formLabelRequired"><spring:message code="dsEdit.opc.host" /></td>
 	<td class="formField"><input id="host" type="text"
 		value="${dataSource.host}" /></td>
 </tr>
 <tr>
-	<td class="formLabelRequired"><fmt:message key="dsEdit.opc.domain" /></td>
+	<td class="formLabelRequired"><spring:message code="dsEdit.opc.domain" /></td>
 	<td class="formField"><input id="domain" type="text"
 		value="${dataSource.domain}" /></td>
 </tr>
 <tr>
-	<td class="formLabelRequired"><fmt:message key="dsEdit.opc.user" /></td>
+	<td class="formLabelRequired"><spring:message code="dsEdit.opc.user" /></td>
 	<td class="formField"><input id="user" type="text"
 		value="${dataSource.user}" /></td>
 </tr>
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.opc.password" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.opc.password" /></td>
 	<td class="formField"><input id="password" type="password"
 		name="password" value="${dataSource.password}" maxlength="20" /></td>
 </tr>
 <tr>
 	<tr>
-		<td class="formLabelRequired"><fmt:message
-			key="dsEdit.opc.server" /></td>
+		<td class="formLabelRequired"><spring:message
+			code="dsEdit.opc.server" /></td>
 		<td class="formField"><sst:select id="server" value=""></sst:select>
 		<div style="height: 2px;"></div>
 		<input id="searchBtn" type="button"
-			value="<fmt:message key="dsEdit.opc.refreshServers"/>"
+			value="<spring:message code="dsEdit.opc.refreshServers"/>"
 			onclick="searchServer();" /></td>
 	</tr>
 	<tr>
-		<td class="formLabelRequired"><fmt:message
-			key="dsEdit.updatePeriod" /></td>
+		<td class="formLabelRequired"><spring:message
+			code="dsEdit.updatePeriod" /></td>
 		<td class="formField"><input type="text" id="updatePeriods"
 			value="${dataSource.updatePeriods}" class="formShort" /> <sst:select
 			id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -342,21 +342,21 @@ function toggleDiv(elem) {
 	</tr>
 
 	<tr>
-		<td class="formLabelRequired"><fmt:message
-			key="dsEdit.opc.creationMode" /></td>
+		<td class="formLabelRequired"><spring:message
+			code="dsEdit.opc.creationMode" /></td>
 		<td class="formField"><sst:select id="selectMethodTag"
 			value="${dataSource.creationMode}" onchange="toggleDiv(this)">
 			<sst:option value="BrowseTags">
-				<fmt:message key="dsEdit.opc.browseTags" />
+				<spring:message code="dsEdit.opc.browseTags" />
 			</sst:option>
 			<sst:option value="AddTags">
-				<fmt:message key="dsEdit.opc.addTags" />
+				<spring:message code="dsEdit.opc.addTags" />
 			</sst:option>
 		</sst:select></td>
 	</tr>
 
 	<tr>
-		<td class="formLabelRequired"><fmt:message key="dsEdit.quantize" /></td>
+		<td class="formLabelRequired"><spring:message code="dsEdit.quantize" /></td>
 		<td class="formField"><sst:checkbox id="quantize"
 			selectedValue="${dataSource.quantize}" /></td>
 	</tr>
@@ -368,15 +368,15 @@ function toggleDiv(elem) {
 	<div id="browseDiv" class="borderDiv marB marR">
 	<table>
 		<tr>
-			<td colspan="2" class="smallTitle"><fmt:message
-				key="dsEdit.opc.tagList" /></td>
+			<td colspan="2" class="smallTitle"><spring:message
+				code="dsEdit.opc.tagList" /></td>
 		</tr>
 
 		<tr>
 			<td colspan="2" align="center"><input id="browseTags"
-				type="button" value="<fmt:message key="dsEdit.opc.browseTags"/>"
+				type="button" value="<spring:message code="dsEdit.opc.browseTags"/>"
 				onclick="browseTags();" /> <input id="addBtn" type="button"
-				value="<fmt:message key="dsEdit.opc.addTags"/>" onclick="addTags();" />
+				value="<spring:message code="dsEdit.opc.addTags"/>" onclick="addTags();" />
 			</td>
 		</tr>
 
@@ -387,10 +387,10 @@ function toggleDiv(elem) {
 			<td>
 			<table cellspacing="1" cellpadding="0" border="0">
 				<thead class="rowHeader">
-					<td align="center"><fmt:message key="dsEdit.opc.tag" /></td>
-					<td align="center"><fmt:message key="dsEdit.pointDataType" /></td>
-					<td align="center"><fmt:message key="dsEdit.settable" /></td>
-					<td align="center"><fmt:message key="common.add" /></td>
+					<td align="center"><spring:message code="dsEdit.opc.tag" /></td>
+					<td align="center"><spring:message code="dsEdit.pointDataType" /></td>
+					<td align="center"><spring:message code="dsEdit.settable" /></td>
+					<td align="center"><spring:message code="common.add" /></td>
 				</thead>
 
 				<!-- TODO why is the height being enforced? -->
@@ -415,15 +415,15 @@ function toggleDiv(elem) {
 	<div id="addDiv" class="borderDiv marB marR">
 	<table>
 		<tr>
-			<td colspan="2" class="smallTitle"><fmt:message
-				key="dsEdit.opc.addTags" /></td>
+			<td colspan="2" class="smallTitle"><spring:message
+				code="dsEdit.opc.addTags" /></td>
 		</tr>
 
 		<tr>
-			<td colspan="2" align="center"><fmt:message
-				key="dsEdit.opc.tagName" /> <input id="tagName" type="text" /> <input
+			<td colspan="2" align="center"><spring:message
+				code="dsEdit.opc.tagName" /> <input id="tagName" type="text" /> <input
 				id="btnAddTag" type="button"
-				value="<fmt:message key="dsEdit.opc.validateTag"/>"
+				value="<spring:message code="dsEdit.opc.validateTag"/>"
 				onclick="validateTag();" /></td>
 			</td>
 		</tr>
@@ -436,11 +436,11 @@ function toggleDiv(elem) {
 			<td>
 			<table cellspacing="1" cellpadding="0" border="0">
 				<thead class="rowHeader">
-					<td align="center"><fmt:message key="dsEdit.opc.tag" /></td>
-					<td align="center"><fmt:message key="dsEdit.pointDataType" /></td>
-					<td align="center"><fmt:message key="dsEdit.settable" /></td>
-					<td align="center"><fmt:message key="dsEdit.opc.validation" /></td>
-					<td align="center"><fmt:message key="common.add" /></td>
+					<td align="center"><spring:message code="dsEdit.opc.tag" /></td>
+					<td align="center"><spring:message code="dsEdit.pointDataType" /></td>
+					<td align="center"><spring:message code="dsEdit.settable" /></td>
+					<td align="center"><spring:message code="dsEdit.opc.validation" /></td>
+					<td align="center"><spring:message code="common.add" /></td>
 				</thead>
 
 				<!-- TODO why is the height being enforced? -->
@@ -451,7 +451,7 @@ function toggleDiv(elem) {
 
 		<tr>
 			<td colspan="2" align="center"><input id="btnAddTag"
-				type="button" value="<fmt:message key="dsEdit.opc.addTags"/>"
+				type="button" value="<spring:message code="dsEdit.opc.addTags"/>"
 				onclick="btnAddTag();" /></td>
 		</tr>
 
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editOpenV4J.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editOpenV4J.jsp
index eb8b923d1c..7d0c64fc8a 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editOpenV4J.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editOpenV4J.jsp
@@ -39,7 +39,7 @@
 
     function refresh() {
         checkButtons(true);
-        $set("refreshMessage", "<fmt:message key='dsEdit.openv4j.refreshing' />");
+        $set("refreshMessage", "<spring:message code='dsEdit.openv4j.refreshing' />");
         dwr.util.removeAllRows("openv4jValues");
         DataSourceEditDwr.searchOpenV4J($get("commPortId"), refreshCB);
     }
@@ -64,7 +64,7 @@
                 function(value) { return value.value; },
                 function(value) {
                     return writeImage("scanDeviceImg" + value.name, null, "icon_comp_add",
-                    "<fmt:message key="common.add"/>", "addPoint('"+ value.name + "')");
+                    "<spring:message code="common.add"/>", "addPoint('"+ value.name + "')");
                 }
             ],
             {
@@ -89,7 +89,7 @@
     }
 
     function cancelRefreshCB() {
-        $set("refreshMessage", "<fmt:message key='dsEdit.openv4j.refreshStopped'/>");
+        $set("refreshMessage", "<spring:message code='dsEdit.openv4j.refreshStopped'/>");
         checkButtons(false);
     }
 
@@ -101,10 +101,10 @@
     }
 
     function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.openv4j.group'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.openv4j.group'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.groupLabel; };
 
-        pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key='dsEdit.openv4j.label'/>";
+        pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code='dsEdit.openv4j.label'/>";
         pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.label; };
 
     }
@@ -187,12 +187,12 @@
     }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.openv4j.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.openv4j.desc"/></c:set>
 <c:set var="dsHelpId" value="openv4jDS"/>
 <%@include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 
       <tr>
-        <td class="formLabelRequired"><fmt:message key="dsEdit.serial.port"/></td>
+        <td class="formLabelRequired"><spring:message code="dsEdit.serial.port"/></td>
         <td class="formField">
           <c:choose>
             <c:when test="${!empty commPortError}">
@@ -211,19 +211,19 @@
       </tr>
       
       <tr>
-        <td class="formLabelRequired"><fmt:message key="dsEdit.openv4j.device"/></td>
+        <td class="formLabelRequired"><spring:message code="dsEdit.openv4j.device"/></td>
         <td class="formField">
           <sst:select id="device" value="${dataSource.device}" onchange="deviceChanged();">
             <c:forEach items="${dataSource.devices}" var="device">
               <sst:option value="${device}">${device.label}</sst:option>
             </c:forEach>
           </sst:select>
-          <input id="detectDeviceBtn" type="button" value="<fmt:message key="dsEdit.openv4j.detectDevice"/>" onclick="detectDevice();"/>
+          <input id="detectDeviceBtn" type="button" value="<spring:message code="dsEdit.openv4j.detectDevice"/>" onclick="detectDevice();"/>
         </td>
       </tr>
       
       <tr>
-        <td class="formLabelRequired"><fmt:message key="dsEdit.openv4j.protocol"/></td>
+        <td class="formLabelRequired"><spring:message code="dsEdit.openv4j.protocol"/></td>
         <td class="formField">
           <sst:select id="protocol" value="${dataSource.protocol}">
             <c:forEach items="${dataSource.protocols}" var="protocol">
@@ -234,7 +234,7 @@
       </tr>
       
       <tr>
-        <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+        <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
         <td class="formField">
           <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
           <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -250,11 +250,11 @@
 <td valign="top">
   <div class="borderDiv marB">
     <table>
-      <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.openv4j.refresh"/></td></tr>
+      <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.openv4j.refresh"/></td></tr>
         <tr>
           <td colspan="2" align="center">
-            <input id="refreshBtn" type="button" value="<fmt:message key="dsEdit.openv4j.refresh"/>" onclick="refresh();"/>
-            <input id="cancelRefreshBtn" type="button" value="<fmt:message key="common.cancel"/>" onclick="cancelRefresh();"/>
+            <input id="refreshBtn" type="button" value="<spring:message code="dsEdit.openv4j.refresh"/>" onclick="refresh();"/>
+            <input id="cancelRefreshBtn" type="button" value="<spring:message code="common.cancel"/>" onclick="cancelRefresh();"/>
           </td>
         </tr>
 
@@ -264,10 +264,10 @@
           <td colspan="2">
             <table cellspacing="1">
               <tr class="rowHeader">
-                <td><fmt:message key="dsEdit.openv4j.group"/></td>
-                <td><fmt:message key="dsEdit.openv4j.label"/></td>
-                <td><fmt:message key="dsEdit.openv4j.value"/></td>
-                <td><fmt:message key="dsEdit.openv4j.add"/></td>
+                <td><spring:message code="dsEdit.openv4j.group"/></td>
+                <td><spring:message code="dsEdit.openv4j.label"/></td>
+                <td><spring:message code="dsEdit.openv4j.value"/></td>
+                <td><spring:message code="dsEdit.openv4j.add"/></td>
               </tr>
               <tbody id="openv4jValues"></tbody>
             </table>
@@ -279,7 +279,7 @@
         <tag:pointList pointHelpId="openv4jPP">
           <tbody id="editableAttributes">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="dsEdit.openv4j.group"/></td>
+              <td class="formLabelRequired"><spring:message code="dsEdit.openv4j.group"/></td>
               <td class="formField">
                 <sst:select id="editGroup" onchange="editGroupChanged()">
                   <c:forEach items="${dataSource.groups}" var="group">
@@ -290,14 +290,14 @@
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="dsEdit.openv4j.label"/></td>
+              <td class="formLabelRequired"><spring:message code="dsEdit.openv4j.label"/></td>
               <td class="formField"><select id="editDataPoint" onchange="editDataPointChanged()"/></td>
             </tr>
           </tbody>
 
           <tbody id="readonlyAttributes">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="dsEdit.openv4j.dataPointSettable"/></td>
+              <td class="formLabelRequired"><spring:message code="dsEdit.openv4j.dataPointSettable"/></td>
               <td class="formField"><input type="checkbox" id="dataPointSettable" disabled="disabled"/></td>
             </tr>
           </tbody>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editPachube.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editPachube.jsp
index 563ac8b788..076742a883 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editPachube.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editPachube.jsp
@@ -37,9 +37,9 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.pachube.feedId"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.pachube.feedId"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.feedId; };
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.pachube.dataStreamId"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.pachube.dataStreamId"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
           function(p) { return encodeHtml(p.pointLocator.dataStreamId); };
   }
@@ -71,11 +71,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.pachube.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.pachube.desc"/></c:set>
 <c:set var="dsHelpId" value="pachubeDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -85,24 +85,24 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.pachube.apiKey"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.pachube.apiKey"/></td>
           <td class="formField"><input id="apiKey" type="text" value="${dataSource.apiKey}" class="formLong"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.pachube.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.pachube.timeout"/></td>
           <td class="formField"><input id="timeoutSeconds" type="text" value="${dataSource.timeoutSeconds}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.pachube.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.pachube.retries"/></td>
           <td class="formField"><input id="retries" type="text" value="${dataSource.retries}"/></td>
         </tr>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsEventsFoot.jspf" %>
 
 <tag:pointList pointHelpId="pachubePP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select name="dataTypeId" onchange="dataTypeChanged()">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -111,13 +111,13 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pachube.feedId"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pachube.feedId"/></td>
     <td class="formField"><input type="text" id="feedId"/></td>
   </tr>
   
   <tr>
     <td class="formLabelRequired">
-      <fmt:message key="dsEdit.pachube.dataStreamId"/>
+      <spring:message code="dsEdit.pachube.dataStreamId"/>
       <tag:img id="valueTestImg" png="accept" title="dsEdit.pachube.testValue" onclick="testValueParams()"/>
     </td>
     <td class="formField"><input type="text" id="dataStreamId"/></td>
@@ -132,13 +132,13 @@
   
   <tbody id="binaryZeroValueRow">
     <tr>
-      <td><fmt:message key="dsEdit.pachube.binaryZeroValue"/></td>
+      <td><spring:message code="dsEdit.pachube.binaryZeroValue"/></td>
       <td class="formField"><input type="text" id="binary0Value"/></td>
     </tr>
   </tbody>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.settable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.settable"/></td>
     <td class="formField"><input type="checkbox" id="settable"/></td>
   </tr>
 </tag:pointList>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editPersistent.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editPersistent.jsp
index 71821a957d..e095a60514 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editPersistent.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editPersistent.jsp
@@ -52,21 +52,21 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.persistent.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.persistent.desc"/></c:set>
 <c:set var="dsHelpId" value="persistentDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.persistent.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.persistent.port"/></td>
           <td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.persistent.authorizationKey"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.persistent.authorizationKey"/></td>
           <td class="formField"><input id="authorizationKey" type="text" value="${dataSource.authorizationKey}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.persistent.acceptPointUpdates"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.persistent.acceptPointUpdates"/></td>
           <td class="formField"><sst:checkbox id="acceptPointUpdates" selectedValue="${dataSource.acceptPointUpdates}"/></td>
         </tr>
         
@@ -79,10 +79,10 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td class="smallTitle"><fmt:message key="dsEdit.persistent.status"/></td></tr>
+        <tr><td class="smallTitle"><spring:message code="dsEdit.persistent.status"/></td></tr>
         <tr>
           <td align="center">
-            <input id="getStatusBtn" type="button" value="<fmt:message key="dsEdit.persistent.getStatus"/>" onclick="getRtStatus();"/>
+            <input id="getStatusBtn" type="button" value="<spring:message code="dsEdit.persistent.getStatus"/>" onclick="getRtStatus();"/>
           </td>
         </tr>
         
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editPop3.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editPop3.jsp
index 6c3ad70123..dbe873a5e5 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editPop3.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editPop3.jsp
@@ -51,7 +51,7 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.pop3.regex"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.pop3.regex"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
           function(p) { return encodeHtml(p.pointLocator.valueRegex); };
   }
@@ -91,12 +91,12 @@
       if (dataTypeId == <%= DataTypes.BINARY %>) {
           show("valueFormatRow");
           hide("numberFormatHelp");
-          $set("valueFormatLabel", "<fmt:message key="dsEdit.pop3.binary0Value"/>");
+          $set("valueFormatLabel", "<spring:message code="dsEdit.pop3.binary0Value"/>");
       }
       else if (dataTypeId == <%= DataTypes.NUMERIC %>) {
           show("valueFormatRow");
           show("numberFormatHelp");
-          $set("valueFormatLabel", "<fmt:message key="dsEdit.pop3.numberFormat"/>");
+          $set("valueFormatLabel", "<spring:message code="dsEdit.pop3.numberFormat"/>");
       }
       else {
           hide("numberFormatHelp");
@@ -116,11 +116,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.pop3.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.pop3.desc"/></c:set>
 <c:set var="dsHelpId" value="pop3DS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.pop3.checkPeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.pop3.checkPeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -130,18 +130,18 @@
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.pop3.server"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.pop3.server"/></td>
           <td class="formField"><input id="pop3Server" type="text" value="${dataSource.pop3Server}"
                   class="formLong"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.pop3.username"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.pop3.username"/></td>
           <td class="formField"><input id="username" type="text" value="${dataSource.username}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.pop3.password"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.pop3.password"/></td>
           <td class="formField"><input id="password" type="text" value="${dataSource.password}"/></td>
         </tr>
       </table>
@@ -152,13 +152,13 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td class="smallTitle"><fmt:message key="dsEdit.pop3.testContent"/></td></tr>
+        <tr><td class="smallTitle"><spring:message code="dsEdit.pop3.testContent"/></td></tr>
         <tr><td><textarea id="testData" cols="60" rows="10"></textarea></td></tr>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsFoot.jspf" %>
 
 <tag:pointList pointHelpId="pop3PP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select name="dataTypeId" onchange="dataTypeChanged()">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -167,13 +167,13 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pop3.findInSubject"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pop3.findInSubject"/></td>
     <td class="formField"><input type="checkbox" id="findInSubject"/></td>
   </tr>
   
   <tr>
     <td class="formLabelRequired">
-      <fmt:message key="dsEdit.pop3.valueRegex"/>
+      <spring:message code="dsEdit.pop3.valueRegex"/>
       <tag:img id="valueTestImg" png="accept" title="dsEdit.pop3.testValue" onclick="testValueParams()"/>
     </td>
     <td class="formField">
@@ -190,7 +190,7 @@
   </tbody>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pop3.ignoreIfMissing"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pop3.ignoreIfMissing"/></td>
     <td class="formField"><input type="checkbox" id="ignoreIfMissing"/></td>
   </tr>
   
@@ -205,13 +205,13 @@
   </tbody>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pop3.useMessageTime"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pop3.useMessageTime"/></td>
     <td class="formField"><input type="checkbox" id="useReceivedTime" onclick="useReceivedTimeChanged()"/></td>
   </tr>
   
   <tr>
     <td class="formLabel">
-      <fmt:message key="dsEdit.pop3.timeRegex"/>
+      <spring:message code="dsEdit.pop3.timeRegex"/>
       <tag:img id="timeTestImg" png="accept" title="dsEdit.pop3.testTime" onclick="testTimeParams()"/>
     </td>
     <td class="formField">
@@ -229,7 +229,7 @@
   
   <tbody id="timeFormatRow">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.pop3.timeFormat"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.pop3.timeFormat"/></td>
       <td class="formField">
         <input type="text" id="timeFormat"/>
         <tag:help id="datetimeFormats"/>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editRadiuino.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editRadiuino.jsp
index 669bccb833..f71dc06a70 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editRadiuino.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editRadiuino.jsp
@@ -81,13 +81,13 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.radiuino.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.radiuino.desc"/></c:set>
 <c:set var="dsHelpId" value="radiuinoDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.radiuino.commPortId" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.radiuino.commPortId" /></td>
 	<td class="formField"><c:choose>
 		<c:when test="${!empty commPortError}">
 			<input id="commPortId" type="hidden" value="" />
@@ -104,8 +104,8 @@
 </tr>
 
 <tr>
-	<td class="formLabelRequired"><fmt:message
-		key="dsEdit.radiuino.baud" /></td>
+	<td class="formLabelRequired"><spring:message
+		code="dsEdit.radiuino.baud" /></td>
 	<td class="formField"><sst:select id="baudRate"
 		value="${dataSource.baudRate}">
 		<sst:option>110</sst:option>
@@ -125,7 +125,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.radiuino.dataBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.radiuino.dataBits"/></td>
   <td class="formField">
     <sst:select id="dataBits" value="${dataSource.dataBits}">
       <sst:option value="5">5</sst:option>
@@ -137,7 +137,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.radiuino.stopBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.radiuino.stopBits"/></td>
   <td class="formField">
     <sst:select id="stopBits" value="${dataSource.stopBits}">
       <sst:option value="1">1</sst:option>
@@ -148,30 +148,30 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.radiuino.parity"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.radiuino.parity"/></td>
   <td class="formField">
     <sst:select id="parity" value="${dataSource.parity}">
-      <sst:option value="0"><fmt:message key="dsEdit.modbusSerial.parity.none"/></sst:option>
-      <sst:option value="1"><fmt:message key="dsEdit.modbusSerial.parity.odd"/></sst:option>
-      <sst:option value="2"><fmt:message key="dsEdit.modbusSerial.parity.even"/></sst:option>
-      <sst:option value="3"><fmt:message key="dsEdit.modbusSerial.parity.mark"/></sst:option>
-      <sst:option value="4"><fmt:message key="dsEdit.modbusSerial.parity.space"/></sst:option>
+      <sst:option value="0"><spring:message code="dsEdit.modbusSerial.parity.none"/></sst:option>
+      <sst:option value="1"><spring:message code="dsEdit.modbusSerial.parity.odd"/></sst:option>
+      <sst:option value="2"><spring:message code="dsEdit.modbusSerial.parity.even"/></sst:option>
+      <sst:option value="3"><spring:message code="dsEdit.modbusSerial.parity.mark"/></sst:option>
+      <sst:option value="4"><spring:message code="dsEdit.modbusSerial.parity.space"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.radiuino.pollingMode"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.radiuino.pollingMode"/></td>
   <td class="formField">
     <sst:select id="pollingMode" value="${dataSource.pollingMode}">
-      <sst:option value="true"><fmt:message key="dsEdit.radiuino.pollingMode.true"/></sst:option>
-      <sst:option value="false"><fmt:message key="dsEdit.radiuino.pollingMode.false"/></sst:option>
+      <sst:option value="true"><spring:message code="dsEdit.radiuino.pollingMode.true"/></sst:option>
+      <sst:option value="false"><spring:message code="dsEdit.radiuino.pollingMode.false"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -181,11 +181,11 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.radiuino.retries"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.radiuino.retries"/></td>
     <td class="formField"><input type="text" id="retries" value="${dataSource.retries}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.radiuino.timeout"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.radiuino.timeout"/></td>
     <td class="formField"><input type="text" id="timeout" value="${dataSource.timeout}"/></td>
   </tr>  
   
@@ -193,27 +193,27 @@
 
 <tag:pointList pointHelpId="radiuinoPP">
 	<tr>
-		<td class="formLabelRequired"><fmt:message
-				key="dsEdit.radiuino.endereco" /></td>
+		<td class="formLabelRequired"><spring:message
+				code="dsEdit.radiuino.endereco" /></td>
 		<td class="formField"><input id="enderecoSensor" type="text"
 			value="" /></td>
 	</tr>
 	<tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.radiuino.radiuinoDataType"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.radiuino.radiuinoDataType"/></td>
           <td class="formField">
             <select id="test_radiuinoDataType">
-              <option value="<c:out value="<%= RadiuinoDataType.BINARY %>"/>"><fmt:message key="dsEdit.radiuino.radiuinoDataType.binary"/></option>
-              <option value="<c:out value="<%= RadiuinoDataType.ONE_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.radiuino.radiuinoDataType.1bUnsigned"/></option>
-              <option value="<c:out value="<%= RadiuinoDataType.TWO_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.radiuino.radiuinoDataType.2bUnsigned"/></option>
-              <option value="<c:out value="<%= RadiuinoDataType.FOUR_BYTE_INT_UNSIGNED %>"/>"><fmt:message key="dsEdit.radiuino.radiuinoDataType.4bUnsigned"/></option>
-              <option value="<c:out value="<%= RadiuinoDataType.FOUR_BYTE_FLOAT %>"/>"><fmt:message key="dsEdit.radiuino.radiuinoDataType.4bFloat"/></option>
-              <option value="<c:out value="<%= RadiuinoDataType.RSSI %>"/>"><fmt:message key="dsEdit.radiuino.radiuinoDataType.RSSI"/></option>
+              <option value="<c:out value="<%= RadiuinoDataType.BINARY %>"/>"><spring:message code="dsEdit.radiuino.radiuinoDataType.binary"/></option>
+              <option value="<c:out value="<%= RadiuinoDataType.ONE_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.radiuino.radiuinoDataType.1bUnsigned"/></option>
+              <option value="<c:out value="<%= RadiuinoDataType.TWO_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.radiuino.radiuinoDataType.2bUnsigned"/></option>
+              <option value="<c:out value="<%= RadiuinoDataType.FOUR_BYTE_INT_UNSIGNED %>"/>"><spring:message code="dsEdit.radiuino.radiuinoDataType.4bUnsigned"/></option>
+              <option value="<c:out value="<%= RadiuinoDataType.FOUR_BYTE_FLOAT %>"/>"><spring:message code="dsEdit.radiuino.radiuinoDataType.4bFloat"/></option>
+              <option value="<c:out value="<%= RadiuinoDataType.RSSI %>"/>"><spring:message code="dsEdit.radiuino.radiuinoDataType.RSSI"/></option>
             </select>
           </td>
         </tr>
 	<tr>
-		<td class="formLabelRequired"><fmt:message
-				key="dsEdit.radiuino.indiceByte" /></td>
+		<td class="formLabelRequired"><spring:message
+				code="dsEdit.radiuino.indiceByte" /></td>
 		<td class="formField">
 		    <select id="indiceByte">
 		      <option value="0">0</option>
@@ -272,23 +272,23 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="formLabelRequired"><fmt:message
-				key="dsEdit.radiuino.multiplicador" /></td>
+		<td class="formLabelRequired"><spring:message
+				code="dsEdit.radiuino.multiplicador" /></td>
 		<td class="formField"><input id="multiplicador" type="text" /></td>
 	</tr>
 	<tr>
-		<td class="formLabelRequired"><fmt:message
-				key="dsEdit.radiuino.offset" /></td>
+		<td class="formLabelRequired"><spring:message
+				code="dsEdit.radiuino.offset" /></td>
 		<td class="formField"><input id="offset" type="text" /></td>
 	</tr>
 	<tr>
 		<td colspan=2>
 		<fieldset style="border-top: 1px solid green;border-left: none;border-bottom: 1px solid green;border-right: none;">
-		<legend><span id="spanAvancado" onclick="changeAvancado();" style="cursor:hand;">+ </span><fmt:message key="dsEdit.radiuino.avancado"/></legend>
+		<legend><span id="spanAvancado" onclick="changeAvancado();" style="cursor:hand;">+ </span><spring:message code="dsEdit.radiuino.avancado"/></legend>
 			<table id="tableAvancado" style="display:none;">
 			<tr>
-				<td class="formLabelRequired" style="text-align: center;"><fmt:message
-						key="dsEdit.radiuino.mapaBytesRequisicao" /></td>
+				<td class="formLabelRequired" style="text-align: center;"><spring:message
+						code="dsEdit.radiuino.mapaBytesRequisicao" /></td>
 				<td class="formField"><input id="mapaBytesRequisicao" type="hidden" /></td>
 			</tr>
 			<tr>
@@ -305,8 +305,8 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="formLabelRequired" style="text-align: center;"><fmt:message
-						key="dsEdit.radiuino.mapaBytesEnvio" /></td>
+				<td class="formLabelRequired" style="text-align: center;"><spring:message
+						code="dsEdit.radiuino.mapaBytesEnvio" /></td>
 				<td class="formField"><input id="mapaBytesEnvio" type="hidden"/></td>
 			</tr>
 			<tr>
@@ -327,8 +327,8 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="formLabelRequired"><fmt:message
-				key="dsEdit.radiuino.settableOverride" /></td>
+		<td class="formLabelRequired"><spring:message
+				code="dsEdit.radiuino.settableOverride" /></td>
 		<td class="formField"><input id="settableOverride"
 			type="checkbox" /></td>
 	</tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editSerialSettings.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editSerialSettings.jsp
index 451046e26b..cfff865916 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editSerialSettings.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editSerialSettings.jsp
@@ -20,7 +20,7 @@
 <%@page import="com.serotonin.mango.Common"%>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.serial.port"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.serial.port"/></td>
   <td class="formField">
     <c:choose>
       <c:when test="${!empty commPortError}">
@@ -39,7 +39,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.serial.baud"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.serial.baud"/></td>
   <td class="formField">
     <sst:select id="baudRate" value="${serialPortSettings != null ? serialPortSettings.baudRate : rxtxDefaultBaudrate}">
       <sst:option>110</sst:option>
@@ -60,29 +60,29 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.serial.flowControlIn"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.serial.flowControlIn"/></td>
   <td class="formField">
     <sst:select id="flowControlIn" value="${serialPortSettings != null ? serialPortSettings.flowControlIn : rxtxDefaultFlowControl}">
-      <sst:option value="NONE"><fmt:message key="dsEdit.serial.flow.none"/></sst:option>
-      <sst:option value="RTS|CTS"><fmt:message key="dsEdit.serial.flow.rtsCts"/></sst:option>
-      <sst:option value="XON|XOFF"><fmt:message key="dsEdit.serial.flow.xonXoff"/></sst:option>
+      <sst:option value="NONE"><spring:message code="dsEdit.serial.flow.none"/></sst:option>
+      <sst:option value="RTS|CTS"><spring:message code="dsEdit.serial.flow.rtsCts"/></sst:option>
+      <sst:option value="XON|XOFF"><spring:message code="dsEdit.serial.flow.xonXoff"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.serial.flowOut"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.serial.flowOut"/></td>
   <td class="formField">
     <sst:select id="flowControlOut" value="${serialPortSettings != null ? serialPortSettings.flowControlOut : rxtxDefaultFlowControl}">
-      <sst:option value="NONE"><fmt:message key="dsEdit.serial.flow.none"/></sst:option>
-      <sst:option value="RTS|CTS"><fmt:message key="dsEdit.serial.flow.rtsCts"/></sst:option>
-      <sst:option value="XON|XOFF"><fmt:message key="dsEdit.serial.flow.xonXoff"/></sst:option>
+      <sst:option value="NONE"><spring:message code="dsEdit.serial.flow.none"/></sst:option>
+      <sst:option value="RTS|CTS"><spring:message code="dsEdit.serial.flow.rtsCts"/></sst:option>
+      <sst:option value="XON|XOFF"><spring:message code="dsEdit.serial.flow.xonXoff"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.serial.dataBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.serial.dataBits"/></td>
   <td class="formField">
     <sst:select id="dataBits" value="${serialPortSettings != null ? serialPortSettings.dataBits : rxtxDefaultDataBits}">
       <sst:option value="5">5</sst:option>
@@ -94,7 +94,7 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.serial.stopBits"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.serial.stopBits"/></td>
   <td class="formField">
     <sst:select id="stopBits" value="${serialPortSettings != null ? serialPortSettings.stopBits : rxtxDefaultStopBits}">
       <sst:option value="1">1</sst:option>
@@ -105,24 +105,24 @@
 </tr>
 
 <tr>
-  <td class="formLabelRequired"><fmt:message key="dsEdit.serial.parity"/></td>
+  <td class="formLabelRequired"><spring:message code="dsEdit.serial.parity"/></td>
   <td class="formField">
     <sst:select id="parity" value="${serialPortSettings != null ? serialPortSettings.parity : rxtxDefaultParity}">
-      <sst:option value="NONE"><fmt:message key="dsEdit.serial.parity.none"/></sst:option>
-      <sst:option value="ODD"><fmt:message key="dsEdit.serial.parity.odd"/></sst:option>
-      <sst:option value="EVEN"><fmt:message key="dsEdit.serial.parity.even"/></sst:option>
-      <sst:option value="MARK"><fmt:message key="dsEdit.serial.parity.mark"/></sst:option>
-      <sst:option value="SPACE"><fmt:message key="dsEdit.serial.parity.space"/></sst:option>
+      <sst:option value="NONE"><spring:message code="dsEdit.serial.parity.none"/></sst:option>
+      <sst:option value="ODD"><spring:message code="dsEdit.serial.parity.odd"/></sst:option>
+      <sst:option value="EVEN"><spring:message code="dsEdit.serial.parity.even"/></sst:option>
+      <sst:option value="MARK"><spring:message code="dsEdit.serial.parity.mark"/></sst:option>
+      <sst:option value="SPACE"><spring:message code="dsEdit.serial.parity.space"/></sst:option>
     </sst:select>
   </td>
 </tr>
 
 <tr>
-    <td class="formLabelRequired" for="inputBufferSize" ><fmt:message key="dsEdit.serial.inputBufferSize"/></td>
+    <td class="formLabelRequired" for="inputBufferSize" ><spring:message code="dsEdit.serial.inputBufferSize"/></td>
     <td><input class="formShort" type="text" id="inputBufferSize" value="${serialPortSettings != null ? serialPortSettings.inputBufferSize : rxtxDefaultInputBufferSize}" /></td>
 </tr>
 
 <tr>
-    <td class="formLabelRequired" for="outputBufferSize" ><fmt:message key="dsEdit.serial.outputBufferSize"/></td>
+    <td class="formLabelRequired" for="outputBufferSize" ><spring:message code="dsEdit.serial.outputBufferSize"/></td>
     <td><input class="formShort" type="text" id="outputBufferSize" value="${serialPortSettings != null ? serialPortSettings.outputBufferSize : rxtxDefaultOutputBufferSize}" /></td>
 </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editSnmp.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editSnmp.jsp
index 49b03f393d..60f324c939 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editSnmp.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editSnmp.jsp
@@ -62,7 +62,7 @@
   }
 
   function snmpTest() {
-      $set("snmpTestMessage", "<fmt:message key="dsEdit.snmp.gettingValue"/>");
+      $set("snmpTestMessage", "<spring:message code="dsEdit.snmp.gettingValue"/>");
       snmpTestButton(true);
       DataSourceEditDwr.snmpGetOid($get("snmpTestOid"), $get("host"), $get("port"), $get("snmpVersion"),
               $get("community"), $get("securityName"), $get("authProtocol"), $get("authPassphrase"),
@@ -71,7 +71,7 @@
   }
 
   function snmpWalk() {
-      $set("snmpTestMessage", "<fmt:message key="dsEdit.snmp.gettingValue"/>");
+      $set("snmpTestMessage", "<spring:message code="dsEdit.snmp.gettingValue"/>");
       snmpWalkButton(true);
       DataSourceEditDwr.snmpWalkOid($get("snmpWalkOid"), $get("host"), $get("port"), $get("snmpVersion"),
               $get("community"), $get("securityName"), $get("authProtocol"), $get("authPassphrase"),
@@ -148,7 +148,7 @@
   }
 
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.snmp.oid"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.snmp.oid"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] = function(p) { return p.pointLocator.oid; };
   }
 
@@ -178,11 +178,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.snmp.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.snmp.desc"/></c:set>
 <c:set var="dsHelpId" value="snmpDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -192,27 +192,27 @@
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.host"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.snmp.host"/></td>
           <td class="formField"><input id="host" type="text" value="${dataSource.host}"/></td>
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.snmp.port"/></td>
           <td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.snmp.retries"/></td>
           <td class="formField"><input id="retries" type="text" value="${dataSource.retries}"/></td>
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.snmp.timeout"/></td>
           <td class="formField"><input id="timeout" type="text" value="${dataSource.timeout}"/></td>
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.version"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.snmp.version"/></td>
           <td class="formField">
             <sst:select id="snmpVersion" value="${dataSource.snmpVersion}" onchange="versionChange()">
               <sst:option value="<%= Integer.toString(SnmpConstants.version1) %>">1</sst:option>
@@ -224,7 +224,7 @@
 
         <tbody id="version12Fields" style="display:none;">
           <tr>
-            <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.community"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.snmp.community"/></td>
             <td class="formField"><input id="community" type="text" value="${dataSource.community}"/></td>
           </tr>
         </tbody>
@@ -232,26 +232,26 @@
         <tbody id="version3Fields" style="display:none;">
 
           <tr>
-            <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.securityName"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.snmp.securityName"/></td>
             <td class="formField"><input id="securityName" type="text" value="${dataSource.securityName}"/></td>
           </tr>
 
           <tr>
-            <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.sl.label"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.snmp.sl.label"/></td>
             <td class="formField">
               <sst:select id="securityLevel" value="${dataSource.securityLevel}" onchange="securityLevelChange()">
-                <sst:option value="1"><fmt:message key="dsEdit.snmp.sl.noauthnopriv"/></sst:option>
-                <sst:option value="2"><fmt:message key="dsEdit.snmp.sl.authnopriv"/></sst:option>
-                <sst:option value="3"><fmt:message key="dsEdit.snmp.sl.authpriv"/></sst:option>
+                <sst:option value="1"><spring:message code="dsEdit.snmp.sl.noauthnopriv"/></sst:option>
+                <sst:option value="2"><spring:message code="dsEdit.snmp.sl.authnopriv"/></sst:option>
+                <sst:option value="3"><spring:message code="dsEdit.snmp.sl.authpriv"/></sst:option>
               </sst:select>
             </td>
           </tr>
 
           <tr id="authFieldsProtocol">
-            <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.authProtocol"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.snmp.authProtocol"/></td>
             <td class="formField">
               <sst:select id="authProtocol" value="${dataSource.authProtocol}">
-                <sst:option value="<%= SnmpDataSourceVO.AuthProtocols.NONE %>"><fmt:message key="dsEdit.snmp.none"/></sst:option>
+                <sst:option value="<%= SnmpDataSourceVO.AuthProtocols.NONE %>"><spring:message code="dsEdit.snmp.none"/></sst:option>
                 <sst:option value="<%= SnmpDataSourceVO.AuthProtocols.MD5 %>">MD5</sst:option>
                 <sst:option value="<%= SnmpDataSourceVO.AuthProtocols.SHA %>">SHA</sst:option>
                 <sst:option value="<%= SnmpDataSourceVO.AuthProtocols.HMAC128SHA224 %>">HMAC128 SHA224</sst:option>
@@ -263,15 +263,15 @@
           </tr>
 
           <tr id="authFieldsPassphrase">
-            <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.authPassphrase"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.snmp.authPassphrase"/></td>
             <td class="formField"><input id="authPassphrase" type="text" value="${dataSource.authPassphrase}"/></td>
           </tr>
 
           <tr id="privFieldsProtocol">
-            <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.privProtocol"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.snmp.privProtocol"/></td>
             <td class="formField">
               <sst:select id="privProtocol" value="${dataSource.privProtocol}">
-                <sst:option value="<%= SnmpDataSourceVO.PrivProtocols.NONE %>"><fmt:message key="dsEdit.snmp.none"/></sst:option>
+                <sst:option value="<%= SnmpDataSourceVO.PrivProtocols.NONE %>"><spring:message code="dsEdit.snmp.none"/></sst:option>
                 <sst:option value="<%= SnmpDataSourceVO.PrivProtocols.DES %>">DES</sst:option>
                 <sst:option value="<%= SnmpDataSourceVO.PrivProtocols.AES128 %>">AES128</sst:option>
                 <sst:option value="<%= SnmpDataSourceVO.PrivProtocols.AES192 %>">AES192</sst:option>
@@ -285,29 +285,29 @@
           </tr>
 
           <tr id="privFieldsPassphrase">
-            <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.privPassphrase"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.snmp.privPassphrase"/></td>
             <td class="formField"><input id="privPassphrase" type="text" value="${dataSource.privPassphrase}"/></td>
           </tr>
 
           <tr>
-            <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.contextName"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.snmp.contextName"/></td>
             <td class="formField"><input id="contextName" type="text" value="${dataSource.contextName}"/></td>
           </tr>
 
         </tbody>    
 
         <tr id="trapSection">
-          <td class="formLabel"><fmt:message key="dsEdit.snmp.trapPortEnabled"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.snmp.trapPortEnabled"/></td>
           <td class="formField"><sst:checkbox id="trapEnabled" selectedValue="${dataSource.trapEnabled}" onclick="toggleTrapSetting()"/></td>
         </tr>
 
         <tr id="trapSectionPort">
-          <td class="formLabel"><fmt:message key="dsEdit.snmp.trapPort"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.snmp.trapPort"/></td>
           <td class="formField"><input id="trapPort" type="text" value="${dataSource.trapPort}"/></td>
         </tr>
 
         <tr id="trapSectionAddress">
-          <td class="formLabel"><fmt:message key="dsEdit.snmp.localAddress"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.snmp.localAddress"/></td>
           <td class="formField"><input id="localAddress" type="text" value="${dataSource.localAddress}"/></td>
         </tr>
       </table>
@@ -318,16 +318,16 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td colspan="2" class="smallTitle"><fmt:message key="dsEdit.snmp.testing"/></td></tr>
+        <tr><td colspan="2" class="smallTitle"><spring:message code="dsEdit.snmp.testing"/></td></tr>
 
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.snmp.oid"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.snmp.oid"/></td>
           <td class="formField"><input type="text" id="snmpTestOid"/></td>
         </tr>
 
         <tr>
           <td colspan="2" align="center">
-            <input id="snmpTestBtn" type="button" value="<fmt:message key="dsEdit.snmp.test"/>" onclick="snmpTest();"/>
+            <input id="snmpTestBtn" type="button" value="<spring:message code="dsEdit.snmp.test"/>" onclick="snmpTest();"/>
           </td>
         </tr>
 
@@ -335,17 +335,17 @@
 
         <!--
         <tr>
-          <td colspan="2" class="smallTitle"><fmt:message key="dsEdit.snmp.walking"/></td>
+          <td colspan="2" class="smallTitle"><spring:message code="dsEdit.snmp.walking"/></td>
         </tr>
 
         <tr>
-          <td class="formLabel"><fmt:message key="dsEdit.snmp.oidWalk"/></td>
+          <td class="formLabel"><spring:message code="dsEdit.snmp.oidWalk"/></td>
           <td class="formField"><input type="text" id="snmpWalkOid"/></td>
         </tr>
 
         <tr>
           <td colspan="2" align="center">
-            <input id="snmpWalkBtn" type="button" value="<fmt:message key="dsEdit.snmp.walk"/>" onclick="snmpWalk();"/>
+            <input id="snmpWalkBtn" type="button" value="<spring:message code="dsEdit.snmp.walk"/>" onclick="snmpWalk();"/>
           </td>
         </tr>
 
@@ -357,12 +357,12 @@
 
 <tag:pointList pointHelpId="snmpPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.oid"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.snmp.oid"/></td>
     <td class="formField"><input type="text" id="oid"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId" onchange="dataTypeChanged()">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -371,34 +371,34 @@
   </tr>
   
   <tr id="binary0ValueRow">
-    <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.binary0Value"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.snmp.binary0Value"/></td>
     <td class="formField"><input type="text" id="binary0Value"/></td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.setType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.snmp.setType"/></td>
     <td class="formField">
       <select id="setType">
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.NONE %>"/>"><fmt:message key="dsEdit.snmp.setType.none"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.INTEGER_32 %>"/>"><fmt:message key="dsEdit.snmp.setType.int"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.OCTET_STRING %>"/>"><fmt:message key="dsEdit.snmp.setType.string"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.OID %>"/>"><fmt:message key="dsEdit.snmp.setType.oid"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.IP_ADDRESS %>"/>"><fmt:message key="dsEdit.snmp.setType.ipAddress"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.COUNTER_32 %>"/>"><fmt:message key="dsEdit.snmp.setType.counter"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.GAUGE_32 %>"/>"><fmt:message key="dsEdit.snmp.setType.gauge"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.TIME_TICKS %>"/>"><fmt:message key="dsEdit.snmp.setType.ticks"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.OPAQUE %>"/>"><fmt:message key="dsEdit.snmp.setType.opaque"/></option>
-        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.COUNTER_64 %>"/>"><fmt:message key="dsEdit.snmp.setType.counter64"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.NONE %>"/>"><spring:message code="dsEdit.snmp.setType.none"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.INTEGER_32 %>"/>"><spring:message code="dsEdit.snmp.setType.int"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.OCTET_STRING %>"/>"><spring:message code="dsEdit.snmp.setType.string"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.OID %>"/>"><spring:message code="dsEdit.snmp.setType.oid"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.IP_ADDRESS %>"/>"><spring:message code="dsEdit.snmp.setType.ipAddress"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.COUNTER_32 %>"/>"><spring:message code="dsEdit.snmp.setType.counter"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.GAUGE_32 %>"/>"><spring:message code="dsEdit.snmp.setType.gauge"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.TIME_TICKS %>"/>"><spring:message code="dsEdit.snmp.setType.ticks"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.OPAQUE %>"/>"><spring:message code="dsEdit.snmp.setType.opaque"/></option>
+        <option value="<c:out value="<%= SnmpPointLocatorVO.SetTypes.COUNTER_64 %>"/>"><spring:message code="dsEdit.snmp.setType.counter64"/></option>
       </select>
     </td>
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.snmp.polling"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.snmp.polling"/></td>
     <td class="formField">
       <select id="trapOnly">
-        <option value="false"><fmt:message key="dsEdit.snmp.polling.pollTrap"/></option>
-        <option value="true"><fmt:message key="dsEdit.snmp.polling.trap"/></option>
+        <option value="false"><spring:message code="dsEdit.snmp.polling.pollTrap"/></option>
+        <option value="true"><spring:message code="dsEdit.snmp.polling.trap"/></option>
       </select>
     </td>
   </tr>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editSql.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editSql.jsp
index acad5089ea..ea2dc6f8da 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editSql.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editSql.jsp
@@ -26,7 +26,7 @@
   }
   
   function sqlTest() {
-      $set("sqlTestError", "<fmt:message key="dsEdit.sql.testing"/>");
+      $set("sqlTestError", "<spring:message code="dsEdit.sql.testing"/>");
       show("sqlTestError");
       sqlTestButton(true);
       hide("sqlTestResults");
@@ -90,7 +90,7 @@
       let selectStatementLowerCase = selectStatement.toLowerCase();
       let selectWithLimitLowerCaseRegex = new RegExp("${selectWithLimitLowerCaseRegex}");
       if(statementLimit == 0 && !selectWithLimitLowerCaseRegex.test(selectStatementLowerCase)) {
-        let result = confirm('<fmt:message key="dsEdit.sql.statementLimit.warning"/>');
+        let result = confirm('<spring:message code="dsEdit.sql.statementLimit.warning"/>');
         if(!result) {
            stopImageFader("dsSaveImg");
            return;
@@ -102,7 +102,7 @@
                   $get("password"), selectStatement, $get("rowBasedQuery"), $get("jndiResource"),
                   $get("jndiResourceName"), statementLimit, saveDataSourceCB);
       } else {
-        let message = createValidationMessage("statementLimit","<fmt:message key="badIntegerFormat"/>");
+        let message = createValidationMessage("statementLimit","<spring:message code="badIntegerFormat"/>");
         showDwrMessages([message]);
         stopImageFader("dsSaveImg");
       }
@@ -145,13 +145,13 @@
   
   function rowBasedQueryChange() {
       if ($get("rowBasedQuery")) {
-          $set("fieldNameLabel", "<fmt:message key="dsEdit.sql.rowId"/>");
-          $set("fieldNameTitle", "<fmt:message key="dsEdit.sql.rowId"/>");
+          $set("fieldNameLabel", "<spring:message code="dsEdit.sql.rowId"/>");
+          $set("fieldNameTitle", "<spring:message code="dsEdit.sql.rowId"/>");
           hide("columnBasedProperties");
       }
       else {
-          $set("fieldNameLabel", "<fmt:message key="dsEdit.sql.columnName"/>");
-          $set("fieldNameTitle", "<fmt:message key="dsEdit.sql.columnName"/>");
+          $set("fieldNameLabel", "<spring:message code="dsEdit.sql.columnName"/>");
+          $set("fieldNameTitle", "<spring:message code="dsEdit.sql.columnName"/>");
           show("columnBasedProperties");
       }
   }
@@ -171,11 +171,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.sql.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.sql.desc"/></c:set>
 <c:set var="dsHelpId" value="sqlDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
           <td class="formField">
             <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort"/>
             <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -185,54 +185,54 @@
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.sql.jndiResource"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.sql.jndiResource"/></td>
           <td class="formField">
             <sst:checkbox id="jndiResource" selectedValue="${dataSource.jndiResource}" onclick="changeJndiResource()"/>
           </td>
         </tr>
 
         <tr id="isJndiResource" style="visible:none">
-          <td class="formLabelRequired"><fmt:message key="dsEdit.sql.jndiResourceName"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.sql.jndiResourceName"/></td>
           <td class="formField"><input id="jndiResourceName" type="text" value="${dataSource.jndiResourceName}"/></td>
         </tr>
 
         <tbody id="isNotJndiResource">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="dsEdit.sql.driverClassName"/></td>
+              <td class="formLabelRequired"><spring:message code="dsEdit.sql.driverClassName"/></td>
               <td class="formField"><input id="driverClassname" type="text" value="${dataSource.driverClassname}"/></td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="dsEdit.sql.connectionString"/></td>
+              <td class="formLabelRequired"><spring:message code="dsEdit.sql.connectionString"/></td>
               <td class="formField"><input id="connectionUrl" type="text" value="${dataSource.connectionUrl}"
                       class="formLong"/></td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="dsEdit.sql.username"/></td>
+              <td class="formLabelRequired"><spring:message code="dsEdit.sql.username"/></td>
               <td class="formField"><input id="username" type="text" value="${dataSource.username}"/></td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="dsEdit.sql.password"/></td>
+              <td class="formLabelRequired"><spring:message code="dsEdit.sql.password"/></td>
               <td class="formField"><input id="password" type="text" value="${dataSource.password}"/></td>
             </tr>
         </tbody>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.sql.select"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.sql.select"/></td>
           <td class="formField">
             <textarea id="selectStatement" rows="10" cols="45"><c:out value="${dataSource.selectStatement}"/></textarea>
           </td>
         </tr>
 
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.sql.statementLimit"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.sql.statementLimit"/></td>
           <td class="formField"><input id="statementLimit" type="number" value="${dataSource.statementLimit}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.sql.rowQuery"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.sql.rowQuery"/></td>
           <td class="formField">
             <sst:checkbox id="rowBasedQuery" selectedValue="${dataSource.rowBasedQuery}"
                     onclick="rowBasedQueryChange()"/>
@@ -247,11 +247,11 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table cellspacing="1">
-        <tr><td class="smallTitle"><fmt:message key="dsEdit.sql.test"/></td></tr>
+        <tr><td class="smallTitle"><spring:message code="dsEdit.sql.test"/></td></tr>
         
         <tr>
           <td align="center">
-            <input id="sqlTestBtn" type="button" value="<fmt:message key="dsEdit.sql.execute"/>" onclick="sqlTest();"/>
+            <input id="sqlTestBtn" type="button" value="<spring:message code="dsEdit.sql.execute"/>" onclick="sqlTest();"/>
           </td>
         </tr>
         
@@ -261,7 +261,7 @@
 
 <tag:pointList pointHelpId="sqlPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select name="dataTypeId">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -276,13 +276,13 @@
   
   <tbody id="columnBasedProperties">
     <tr>
-      <td class="formLabel"><fmt:message key="dsEdit.sql.timeColumn"/></td>
+      <td class="formLabel"><spring:message code="dsEdit.sql.timeColumn"/></td>
       <td class="formField"><input type="text" id="timeOverrideName"/></td>
     </tr>
   </tbody>
   
   <tr>
-    <td class="formLabel"><fmt:message key="dsEdit.sql.update"/></td>
+    <td class="formLabel"><spring:message code="dsEdit.sql.update"/></td>
     <td class="formField"><textarea cols="35" rows="4" name="updateStatement"></textarea></td>
   </tr>
 </tag:pointList>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editVMStat.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editVMStat.jsp
index 88a4955459..93a6240cde 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editVMStat.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editVMStat.jsp
@@ -27,7 +27,7 @@
   }
   
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
-      pointListColumnHeaders[pointListColumnHeaders.length] = "<fmt:message key="dsEdit.vmstat.attribute"/>";
+      pointListColumnHeaders[pointListColumnHeaders.length] = "<spring:message code="dsEdit.vmstat.attribute"/>";
       pointListColumnFunctions[pointListColumnFunctions.length] =
               function(p) { return p.pointLocator.configurationDescription; };
   }
@@ -46,15 +46,15 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.vmstat.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.vmstat.desc"/></c:set>
 <c:set var="dsHelpId" value="vmstatDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.vmstat.pollSeconds"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.vmstat.pollSeconds"/></td>
     <td class="formField"><input id="pollSeconds" type="text" value="${dataSource.pollSeconds}"/></td>
   </tr>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.vmstat.outputScale"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.vmstat.outputScale"/></td>
     <td class="formField">
       <sst:select id="outputScale" value="${dataSource.outputScale}">
         <tag:exportCodesOptions sst="true" optionList="<%= VMStatDataSourceVO.OUTPUT_SCALE_CODES.getIdKeys() %>"/>
@@ -65,7 +65,7 @@
 
 <tag:pointList pointHelpId="vmstatPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.vmstat.attribute"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.vmstat.attribute"/></td>
     <td class="formField">
       <select id="attributeId">
         <tag:exportCodesOptions optionList="<%= VMStatPointLocatorVO.ATTRIBUTE_CODES.getIdKeys() %>"/>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editViconics.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editViconics.jsp
index 8939ee3a76..9e8573f1e4 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editViconics.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editViconics.jsp
@@ -42,7 +42,7 @@
   }
   
   function refreshInfo() {
-      $set("infoMessage", "<fmt:message key="dsEdit.viconics.refreshing"/>");
+      $set("infoMessage", "<spring:message code="dsEdit.viconics.refreshing"/>");
       setDisabled("updateBtn", true);
       
       DataSourceEditDwr.getRfModuleInfo(function(result) {
@@ -89,11 +89,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.viconics.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.viconics.desc"/></c:set>
 <c:set var="dsHelpId" value="viconicsDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.port"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.port"/></td>
           <td class="formField">
             <c:choose>
               <c:when test="${!empty commPortError}">
@@ -112,47 +112,47 @@
         </tr>
       
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.panId"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.panId"/></td>
           <td class="formField"><input id="panId" type="text" value="${dataSource.panId}"/></td>
         </tr>
       
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.channel"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.channel"/></td>
           <td class="formField"><input id="channel" type="text" value="${dataSource.channel}"/></td>
         </tr>
       
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.timeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.timeout"/></td>
           <td class="formField"><input id="timeout" type="text" value="${dataSource.timeout}"/></td>
         </tr>
       
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.retries"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.retries"/></td>
           <td class="formField"><input id="retries" type="text" value="${dataSource.retries}"/></td>
         </tr>
       
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.networkTimeout"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.networkTimeout"/></td>
           <td class="formField"><input id="networkTimeoutSeconds" type="text" value="${dataSource.networkTimeoutSeconds}"/></td>
         </tr>
       
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.deviceWarning"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.deviceWarning"/></td>
           <td class="formField"><input id="deviceWarningTimeoutSeconds" type="text" value="${dataSource.deviceWarningTimeoutSeconds}"/></td>
         </tr>
       
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.deviceRemove"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.deviceRemove"/></td>
           <td class="formField"><input id="deviceRemoveTimeoutSeconds" type="text" value="${dataSource.deviceRemoveTimeoutSeconds}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.pointFreshness"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.pointFreshness"/></td>
           <td class="formField"><input id="pointValueMinimumFreshnessSeconds" type="text" value="${dataSource.pointValueMinimumFreshnessSeconds}"/></td>
         </tr>
         
         <tr>
-          <td class="formLabelRequired"><fmt:message key="dsEdit.viconics.convertCelsius"/></td>
+          <td class="formLabelRequired"><spring:message code="dsEdit.viconics.convertCelsius"/></td>
           <td class="formField"><sst:checkbox id="convertToCelsius" selectedValue="${dataSource.convertToCelsius}"/></td>
         </tr>
       </table>
@@ -164,19 +164,19 @@
   <td valign="top">
     <div class="borderDiv marB">
       <table>
-        <tr><td colspan="8" class="smallTitle"><fmt:message key="dsEdit.viconics.networkInfo"/></td></tr>
+        <tr><td colspan="8" class="smallTitle"><spring:message code="dsEdit.viconics.networkInfo"/></td></tr>
         
         <tr><td colspan="8" id="infoMessage" class="formError"></td></tr>
         
         <tbody id="infoData" style="display:none;">
           <tr>
             <td colspan="8">
-              <b><fmt:message key="dsEdit.viconics.rfModule"/></b><br/>
+              <b><spring:message code="dsEdit.viconics.rfModule"/></b><br/>
               <div style="padding-left:20px;float:left;">
-                <fmt:message key="dsEdit.viconics.zigbeeFirmwareRevision"/>:<br/>
-                <fmt:message key="dsEdit.viconics.zigbeeNetworkAddress"/>:<br/>
-                <fmt:message key="dsEdit.viconics.ieee"/>:<br/>
-                <fmt:message key="dsEdit.viconics.chipRevision"/>:<br/>
+                <spring:message code="dsEdit.viconics.zigbeeFirmwareRevision"/>:<br/>
+                <spring:message code="dsEdit.viconics.zigbeeNetworkAddress"/>:<br/>
+                <spring:message code="dsEdit.viconics.ieee"/>:<br/>
+                <spring:message code="dsEdit.viconics.chipRevision"/>:<br/>
               </div>
               <div style="padding-left:10px;float:left;">
                 <span id="rfmFirmware"></span><br/>
@@ -187,17 +187,17 @@
             </td>
           </tr>
           
-          <tr><td colspan="8"><b><fmt:message key="dsEdit.viconics.devices"/></b></td></tr>
+          <tr><td colspan="8"><b><spring:message code="dsEdit.viconics.devices"/></b></td></tr>
           <tr class="rowHeader">
-            <td><fmt:message key="dsEdit.viconics.commAddress"/></td>
-            <td><fmt:message key="dsEdit.viconics.modelNumber"/></td>
-            <td><fmt:message key="dsEdit.viconics.firmwareRevision"/></td>
-            <td><fmt:message key="dsEdit.viconics.zigbeeFirmwareRevisionBr"/></td>
-            <td><fmt:message key="dsEdit.viconics.zigbeeNetworkAddressBr"/></td>
-            <td><fmt:message key="dsEdit.viconics.ieee"/></td>
-            <td><fmt:message key="dsEdit.viconics.chipRevisionBr"/></td>
-            <td><fmt:message key="dsEdit.viconics.trss"/></td>
-            <td><fmt:message key="dsEdit.viconics.crss"/></td>
+            <td><spring:message code="dsEdit.viconics.commAddress"/></td>
+            <td><spring:message code="dsEdit.viconics.modelNumber"/></td>
+            <td><spring:message code="dsEdit.viconics.firmwareRevision"/></td>
+            <td><spring:message code="dsEdit.viconics.zigbeeFirmwareRevisionBr"/></td>
+            <td><spring:message code="dsEdit.viconics.zigbeeNetworkAddressBr"/></td>
+            <td><spring:message code="dsEdit.viconics.ieee"/></td>
+            <td><spring:message code="dsEdit.viconics.chipRevisionBr"/></td>
+            <td><spring:message code="dsEdit.viconics.trss"/></td>
+            <td><spring:message code="dsEdit.viconics.crss"/></td>
           </tr>
         </tbody>
           
@@ -205,7 +205,7 @@
           
         <tr>
           <td colspan="8" align="center">
-            <input id="updateBtn" type="button" value="<fmt:message key="common.refresh"/>" onclick="refreshInfo();"/>
+            <input id="updateBtn" type="button" value="<spring:message code="common.refresh"/>" onclick="refreshInfo();"/>
           </td>
         </tr>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsFoot.jspf" %>
diff --git a/WebContent/WEB-INF/jsp/dataSourceEdit/editVirtual.jsp b/WebContent/WEB-INF/jsp/dataSourceEdit/editVirtual.jsp
index 050e48d693..7032b3cc5f 100644
--- a/WebContent/WEB-INF/jsp/dataSourceEdit/editVirtual.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceEdit/editVirtual.jsp
@@ -145,13 +145,13 @@
       var theValue = $get(prefix);
       var theNumber = parseInt(theValue);
       if (isNaN(theNumber)) {
-          alert("<fmt:message key="dsEdit.virtual.errorParsingValue"/>");
+          alert("<spring:message code="dsEdit.virtual.errorParsingValue"/>");
           return false;
       }
       var arr = currentPoint.pointLocator[prefix +"Change"].values;
       for (var i=arr.length-1; i>=0; i--) {
           if (arr[i] == theNumber) {
-              alert("<fmt:message key="dsEdit.virtual.invalidValue"/> "+ theNumber);
+              alert("<spring:message code="dsEdit.virtual.invalidValue"/> "+ theNumber);
               return false;
           }
       }
@@ -177,7 +177,7 @@
       dwr.util.addRows(prefix +"Values", arr, [
               function(data) { return data; },
               function(data) {
-                  return writeImage(null, null, "bullet_delete", "<fmt:message key="common.delete"/>",
+                  return writeImage(null, null, "bullet_delete", "<spring:message code="common.delete"/>",
                           "removeListValue("+ data +", '"+ prefix +"');");
               }
               ]);
@@ -189,11 +189,11 @@
   }
 </script>
 
-<c:set var="dsDesc"><fmt:message key="dsEdit.virtual.desc"/></c:set>
+<c:set var="dsDesc"><spring:message code="dsEdit.virtual.desc"/></c:set>
 <c:set var="dsHelpId" value="virtualDS"/>
 <%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.updatePeriod"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.updatePeriod"/></td>
     <td class="formField">
       <input type="text" id="updatePeriods" value="${dataSource.updatePeriods}" class="formShort" />
       <sst:select id="updatePeriodType" value="${dataSource.updatePeriodType}">
@@ -205,12 +205,12 @@
 
 <tag:pointList pointHelpId="virtualPP">
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.settable"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.settable"/></td>
     <td class="formField"><input type="checkbox" id="settable"/></td>
   </tr>
 
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.pointDataType"/></td>
     <td class="formField">
       <select id="dataTypeId" onchange="changeDataType();">
         <tag:dataTypeOptions excludeImage="true"/>
@@ -219,7 +219,7 @@
   </tr>
   
   <tr>
-    <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.changeType"/></td>
+    <td class="formLabelRequired"><spring:message code="dsEdit.virtual.changeType"/></td>
     <td class="formField"><select id="changeTypeId" onchange="changeChangeType(this.value);"></select></td>
   </tr>
   
@@ -228,11 +228,11 @@
   --%>
   <tbody id="divCH1" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField">
         <select id="alternateBooleanChange.startValue">
-          <option value="true"><fmt:message key="common.true"/></option>
-          <option value="false"><fmt:message key="common.false"/></option>
+          <option value="true"><spring:message code="common.true"/></option>
+          <option value="false"><spring:message code="common.false"/></option>
         </select>
       </td>
     </tr>
@@ -243,22 +243,22 @@
   --%>
   <tbody id="divCH2" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.min"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.min"/></td>
       <td class="formField"><input type="text" id="brownianChange.min" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.max"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.max"/></td>
       <td class="formField"><input type="text" id="brownianChange.max" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.maxChange"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.maxChange"/></td>
       <td class="formField"><input type="text" id="brownianChange.maxChange" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField"><input type="text" id="brownianChange.startValue" /></td>
     </tr>
   </tbody>
@@ -268,27 +268,27 @@
   --%>
   <tbody id="divCH3" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.min"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.min"/></td>
       <td class="formField"><input type="text" id="incrementAnalogChange.min" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.max"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.max"/></td>
       <td class="formField"><input type="text" id="incrementAnalogChange.max" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.change"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.change"/></td>
       <td class="formField"><input type="text" id="incrementAnalogChange.change" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.roll"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.roll"/></td>
       <td class="formField"><input type="checkbox" id="incrementAnalogChange.roll" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField"><input type="text" id="incrementAnalogChange.startValue" /></td>
     </tr>
   </tbody>
@@ -298,7 +298,7 @@
   --%>
   <tbody id="divCH4" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.values"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.values"/></td>
       <td class="formField">
         <input id="incrementMultistate" type="text" />
         <tag:img png="add" onclick="addListValue('incrementMultistate');" title="common.add" />
@@ -307,12 +307,12 @@
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.roll"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.roll"/></td>
       <td class="formField"><input type="checkbox" id="incrementMultistateChange.roll"></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField"><select id="incrementMultistateChange.startValue"></select></td>
     </tr>
   </tbody>
@@ -322,7 +322,7 @@
   --%>
   <tbody id="divCH5" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField"><input type="text" id="noChange.startValue" /></td>
     </tr>
   </tbody>
@@ -332,17 +332,17 @@
   --%>
   <tbody id="divCH6" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.min"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.min"/></td>
       <td class="formField"><input type="text" id="randomAnalogChange.min" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.max"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.max"/></td>
       <td class="formField"><input type="text" id="randomAnalogChange.max" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField"><input type="text" id="randomAnalogChange.startValue" /></td>
     </tr>
   </tbody>
@@ -352,11 +352,11 @@
   --%>
   <tbody id="divCH7" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField">
         <select id="randomBooleanChange.startValue">
-          <option value="true"><fmt:message key="common.true"/></option>
-          <option value="false"><fmt:message key="common.false"/></option>
+          <option value="true"><spring:message code="common.true"/></option>
+          <option value="false"><spring:message code="common.false"/></option>
         </select>
     </tr>
   </tbody>
@@ -366,7 +366,7 @@
   --%>
   <tbody id="divCH8" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.values"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.values"/></td>
       <td class="formField">
         <input id="randomMultistate" type="text" />
         <tag:img png="add" title="common.add" onclick="addListValue('randomMultistate');" />
@@ -375,7 +375,7 @@
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField"><select id="randomMultistateChange.startValue"></select></td>
     </tr>
   </tbody>
@@ -385,26 +385,26 @@
   --%>
   <tbody id="divCH9" style="display: none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.maxChange"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.maxChange"/></td>
       <td class="formField"><input type="text" id="analogAttractorChange.maxChange" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.volatility"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.volatility"/></td>
       <td class="formField"><input type="text" id="analogAttractorChange.volatility" /></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.attractionPoint"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.attractionPoint"/></td>
       <td class="formField"><select id="analogAttractorChange.attractionPointId">
         <c:forEach items="${analogPoints}" var="dataPoint">
-          <option value="${dataPoint.id}">${dataPoint.extendedName}</option>
+          <option value="${dataPoint.id}"><c:out value="${dataPoint.extendedName}"/></option>
         </c:forEach>
       </select></td>
     </tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="dsEdit.virtual.startValue"/></td>
+      <td class="formLabelRequired"><spring:message code="dsEdit.virtual.startValue"/></td>
       <td class="formField"><input type="text" id="analogAttractorChange.startValue" /></td>
     </tr>
   </tbody>
diff --git a/WebContent/WEB-INF/jsp/dataSourceList.jsp b/WebContent/WEB-INF/jsp/dataSourceList.jsp
index 6c6f9f4ff9..f1d2b77ee9 100644
--- a/WebContent/WEB-INF/jsp/dataSourceList.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceList.jsp
@@ -63,7 +63,7 @@
     }
     
     function deleteDataSource(dataSourceId) {
-        if (confirm("<fmt:message key="dsList.dsDeleteConfirm"/>")) {
+        if (confirm("<spring:message code="dsList.dsDeleteConfirm"/>")) {
             startImageFader("deleteDataSourceImg"+ dataSourceId);
             DataSourceListDwr.deleteDataSource(dataSourceId, function(dataSourceId) {
                 stopImageFader("deleteDataSourceImg"+ dataSourceId);
@@ -85,7 +85,7 @@
     }
     
     function deleteDataPoint(pointId) {
-        if (confirm("<fmt:message key="dsList.pointDeleteConfirm"/>")) {
+        if (confirm("<spring:message code="dsList.pointDeleteConfirm"/>")) {
             DataSourceListDwr.deleteDataPoint(pointId, function(pointId) {
                 var row = $("pointRow"+ pointId);
                 row.parentNode.removeChild(row);
@@ -102,7 +102,7 @@
     <tr>
       <td>
         <tag:img png="icon_ds" title="dsList.dataSources"/>
-        <span class="smallTitle"><fmt:message key="dsList.dataSources"/></span>
+        <span class="smallTitle"><spring:message code="dsList.dataSources"/></span>
         <tag:help id="dataSourceList"/>
       </td>
       <td align="right" id="dataSourceTypesContent" style="display:none">
@@ -119,19 +119,19 @@
             <td colspan="2">
               <table class="dataSourcesTable">
                 <tr class="rowHeader">
-                  <td><fmt:message key="dsList.name"/></td>
-                  <td><fmt:message key="dsList.type"/></td>
-                  <td><fmt:message key="dsList.connection"/></td>
-                  <td><fmt:message key="dsList.status"/></td>
-                  <td><fmt:message key="dsList.statusDescribe"/></td>
+                  <td><spring:message code="dsList.name"/></td>
+                  <td><spring:message code="dsList.type"/></td>
+                  <td><spring:message code="dsList.connection"/></td>
+                  <td><spring:message code="dsList.status"/></td>
+                  <td><spring:message code="dsList.statusDescribe"/></td>
                   <td></td>
                 </tr>
-                <c:set var="hideText"><fmt:message key="dsList.hide"/></c:set>
-                <c:set var="showText"><fmt:message key="dsList.show"/></c:set>
+                <c:set var="hideText"><spring:message code="dsList.hide"/></c:set>
+                <c:set var="showText"><spring:message code="dsList.show"/></c:set>
                 <c:forEach items="${data}" var="listParent"> 
                     <tr class="row" id="dataSourceRow${listParent.parent.id}">
-                    <td><b>${listParent.parent.name}</b></td>
-                    <td><fmt:message key="${listParent.parent.type.key}"/></td>
+                    <td><b><c:out value="${listParent.parent.name}"/></b></td>
+                    <td><spring:message code="${listParent.parent.type.key}"/></td>
                     <td><sst:i18n message="${listParent.parent.connectionDescription}"/></td>
                     <td align="center">
                       <c:choose>
@@ -146,7 +146,7 @@
                       </c:choose>
                     </td>
                     <td id="stateDes${listParent.parent.id}">
-                      ${listParent.parent.state.describe}
+                      <c:out value="${listParent.parent.state.describe}"/>
                     </td>
                     <td>
                       <a href="data_source_edit.shtm?dsid=${listParent.parent.id}"><tag:img png="icon_ds_edit"
@@ -163,14 +163,14 @@
                     <td colspan="5" class="datasource-row">
                       <table cellspacing="1" cellpadding="0" border="0">
                         <tr class="rowHeader">
-                          <td><fmt:message key="dsList.pointName"/></td>
-                          <td><fmt:message key="dsList.description"/></td>
-                          <td><fmt:message key="dsList.status"/></td>
+                          <td><spring:message code="dsList.pointName"/></td>
+                          <td><spring:message code="dsList.description"/></td>
+                          <td><spring:message code="dsList.status"/></td>
                           <td></td>
                         </tr>
                         <c:forEach items="${listParent.list}" var="point">
                           <tr id="pointRow${point.id}">
-                            <td>${point.name}</td>
+                            <td><c:out value="${point.name}"/></td>
                             <td><sst:i18n message="${point.dataTypeMessage}"/> / <sst:i18n message="${point.configurationDescription}"/></td>
                             <td align="center">
                               <c:choose>
diff --git a/WebContent/WEB-INF/jsp/emport.jsp b/WebContent/WEB-INF/jsp/emport.jsp
index 851da428bb..1b0b8b00a8 100644
--- a/WebContent/WEB-INF/jsp/emport.jsp
+++ b/WebContent/WEB-INF/jsp/emport.jsp
@@ -44,7 +44,7 @@
       projectName = $get("projectName");
 
       if(projectName == null || projectName.trim().length == 0) {
-    	  messages = [createValidationMessage("projectName","<fmt:message key="emport.invalidProjectName"/>")];
+    	  messages = [createValidationMessage("projectName","<spring:message code="emport.invalidProjectName"/>")];
   		  showDwrMessages(messages);
     	  return;
       }
@@ -68,7 +68,7 @@
     function doImport() {
         setDisabled("importJsonBtn", true);
         hideGenericMessages("importMessages");
-        $set("alternateMessage", "<fmt:message key="emport.importProgress"/>");
+        $set("alternateMessage", "<spring:message code="emport.importProgress"/>");
         EmportDwr.importData($get("emportData"), function(response) {
             if (response.data.importStarted)
                 importUpdate();
@@ -78,32 +78,32 @@
                 setDisabled("importJsonBtn", false);
             }
             else {
-                $set("alternateMessage", "<fmt:message key="emport.noMessages"/>");
+                $set("alternateMessage", "<spring:message code="emport.noMessages"/>");
                 setDisabled("importJsonBtn", false);
             }
         });
     }
-    
+
     function importUpdate() {
         EmportDwr.importUpdate(function(response) {
             if (response.data.noImport)
                 // no op
                 return;
-            
-            $set("alternateMessage", "<fmt:message key="emport.importProgress"/>");
+
+            $set("alternateMessage", "<spring:message code="emport.importProgress"/>");
             setDisabled("importJsonBtn", true);
             setDisabled("cancelBtn", false);
-            
+
             showDwrMessages(response.messages, $("importMessages"));
-            
+
             if (response.data.cancelled || response.data.complete) {
                 setDisabled("importJsonBtn", false);
                 setDisabled("cancelBtn", true);
-                
+
                 if (response.data.cancelled)
-                    $set("alternateMessage", "<fmt:message key="emport.importCancelled"/>");
+                    $set("alternateMessage", "<spring:message code="emport.importCancelled"/>");
                 else
-                    $set("alternateMessage", "<fmt:message key="emport.importComplete"/>");
+                    $set("alternateMessage", "<spring:message code="emport.importComplete"/>");
             }
             else
                 setTimeout(importUpdate, 1000);
@@ -115,31 +115,31 @@
             if (response.data.noImport)
                 // no op
                 return;
-            
-            $set("alternateMessage", "<fmt:message key="emport.importProgress"/>");
+
+            $set("alternateMessage", "<spring:message code="emport.importProgress"/>");
             setDisabled("importJsonBtn", true);
             setDisabled("cancelBtn", false);
-            
+
             showDwrMessages(response.messages, $("changingProjectMessages"));
-            
+
             if (response.data.cancelled || response.data.complete) {
                 setDisabled("importJsonBtn", false);
                 setDisabled("cancelBtn", true);
-                
+
                 if (response.data.cancelled)
-                    $set("alternateMessage", "<fmt:message key="emport.importCancelled"/>");
+                    $set("alternateMessage", "<spring:message code="emport.importCancelled"/>");
                 else
-                    $set("alternateMessage", "<fmt:message key="emport.importComplete"/>");
+                    $set("alternateMessage", "<spring:message code="emport.importComplete"/>");
             }
             else
                 setTimeout(changingProject, 1000);
         });
     }
-    
+
     function importCancel() {
         EmportDwr.importCancel();
     }
-    
+
     function selectAll(checked) {
         $set("graphicalViews", checked);
         $set("eventHandlers", checked);
@@ -174,14 +174,14 @@
 
 
     function checkFileToImport() {
-    	var ext = $get("importFile");
-    	ext = ext.substring(ext.length-3,ext.length);
+    	let fileName = $get("importFile");
+    	let ext = fileName.substring(fileName.length-3,fileName.length);
     	ext = ext.toLowerCase();
-    	
+
     	if(ext != 'zip') {
-			messages = [createValidationMessage("importFile","Arquivo de importa��o inv�lido! Arquivo deve ter extens�o .zip!")];
+			messages = [createValidationMessage("importFile","<spring:message code="emport.invalidFile" arguments="!"/>")];
     		showDwrMessages(messages);
-        	return false;	
+        	return false;
     	}
 
     	changingProject();
@@ -198,11 +198,11 @@
 				</span> <tag:help id="emport" /></td>
 			</tr>
 			<tr>
-				<td class="formLabel"><b><fmt:message key="emport.select" />
-				</b><br /> <a href="#" onclick="selectAll(true); return false"><fmt:message
-							key="emport.selectAll" />
-				</a> | <a href="#" onclick="selectAll(false); return false"><fmt:message
-							key="emport.unselectAll" />
+				<td class="formLabel"><b><spring:message code="emport.select" />
+				</b><br /> <a href="#" onclick="selectAll(true); return false"><spring:message
+							code="emport.selectAll" />
+				</a> | <a href="#" onclick="selectAll(false); return false"><spring:message
+							code="emport.unselectAll" />
 				</a></td>
 				<td></td>
 			</tr>
@@ -211,16 +211,16 @@
 					type="checkbox" id="watchLists" /> <label for="watchLists"><fmt:message
 							key="header.watchLists" />
 				</label><br /> <input type="checkbox" id="graphicalViews" /> <label
-					for="graphicalViews"><fmt:message key="header.views" />
+					for="graphicalViews"><spring:message code="header.views" />
 				</label><br /> <input type="checkbox" id="eventHandlers" /> <label
-					for="eventHandlers"><fmt:message key="header.eventHandlers" />
+					for="eventHandlers"><spring:message code="header.eventHandlers" />
 				</label><br /> <input type="checkbox" id="dataSources" /> <label
-					for="dataSources"><fmt:message key="header.dataSources" />
+					for="dataSources"><spring:message code="header.dataSources" />
 				</label><br /> <input type="checkbox" id="dataPoints"
 					onchange="dataPointsCheckboxChanged();" /> <label for="dataPoints"><fmt:message
 							key="emport.dataPoints" />
 				</label><br /> - <input type="checkbox" id="pointValues" /> <label
-					for="pointValues"><fmt:message key="emport.pointValues" />
+					for="pointValues"><spring:message code="emport.pointValues" />
 				</label><br /> <input type="checkbox" id="scheduledEvents" /> <label
 					for="scheduledEvents"><fmt:message
 							key="header.scheduledEvents" />
@@ -228,7 +228,7 @@
 					for="compoundEventDetectors"><fmt:message
 							key="header.compoundEvents" />
 				</label><br /> <input type="checkbox" id="pointLinks" /> <label
-                    for="pointLinks"><fmt:message key="header.pointLinks" />
+                    for="pointLinks"><spring:message code="header.pointLinks" />
                 </label><br />
                 </td>
 				<td><input type="checkbox" id="users" /> <label for="users"><fmt:message
@@ -237,33 +237,33 @@
 					for="pointHierarchy"><fmt:message
 							key="header.pointHierarchy" />
 				</label><br /> <input type="checkbox" id="mailingLists" /> <label
-					for="mailingLists"><fmt:message key="header.mailingLists" />
+					for="mailingLists"><spring:message code="header.mailingLists" />
 				</label><br /> <input type="checkbox" id="publishers" /> <label
-					for="publishers"><fmt:message key="header.publishers" />
+					for="publishers"><spring:message code="header.publishers" />
 				</label><br /> <input type="checkbox" id="maintenanceEvents" /> <label
 					for="maintenanceEvents"><fmt:message
 							key="header.maintenanceEvents" />
 				</label><br /> <input type="checkbox" id="scripts" /> <label for="scripts"><fmt:message
 							key="header.scripts" />
 				</label><br /> <input type="checkbox" id="systemSettings" /> <label
-					for="scripts"><fmt:message key="header.systemSettings" />
+					for="scripts"><spring:message code="header.systemSettings" />
 				</label><br />
 				<input type="checkbox" id="usersProfiles" /> <label
-					for="usersProfiles"><fmt:message key="header.usersProfiles" />
+					for="usersProfiles"><spring:message code="header.usersProfiles" />
 				</label>
 				<br />
 				<input type="checkbox" id="reports" /> <label
-                    for="reports"><fmt:message key="header.reports" />
+                    for="reports"><spring:message code="header.reports" />
                 </label>
                 <br />
 				</td>
-				<!--          <input type="checkbox" id="reports"/> <label for="reports"><fmt:message key="header.reports"/></label><br/>-->
-				<!--          <input type="checkbox" id="systemSettings"/> <label for="systemSettings"><fmt:message key="header.systemSettings"/></label><br/>-->
-				<!--          <input type="checkbox" id="imageSets"/> <label for="imageSets"><fmt:message key="header.imageSets"/></label><br/>-->
-				<!--          <input type="checkbox" id="dynamicImages"/> <label for="dynamicImages"><fmt:message key="header.dynamicImages"/></label><br/>-->
+				<!--          <input type="checkbox" id="reports"/> <label for="reports"><spring:message code="header.reports"/></label><br/>-->
+				<!--          <input type="checkbox" id="systemSettings"/> <label for="systemSettings"><spring:message code="header.systemSettings"/></label><br/>-->
+				<!--          <input type="checkbox" id="imageSets"/> <label for="imageSets"><spring:message code="header.imageSets"/></label><br/>-->
+				<!--          <input type="checkbox" id="dynamicImages"/> <label for="dynamicImages"><spring:message code="header.dynamicImages"/></label><br/>-->
 			</tr>
 			<tr>
-				<td class="formLabelRequired"><fmt:message key="emport.indent" />
+				<td class="formLabelRequired"><spring:message code="emport.indent" />
 				</td>
 				<td><input type="text" id="prettyIndent" value="3"
 					class="formVeryShort" />
@@ -290,10 +290,10 @@
 			</tr>
 			<tr>
 				<td colspan="2" align="center"><input id="exportJsonBtn"
-					type="button" value="<fmt:message key="emport.exportJson"/>"
+					type="button" value="<spring:message code="emport.exportJson"/>"
 					onclick="doExportJson()" /></td>
 			</tr>
-			
+
 			<tr>
 				<td colspan="2" align="center">
 				<p></p>
@@ -307,11 +307,11 @@
 				</td>
 			</tr>
 			<tr>
-				<td><fmt:message key="emport.importInstruction" /> <input
+				<td><spring:message code="emport.importInstruction" /> <input
 					id="importJsonBtn" type="button"
-					value="<fmt:message key="emport.import"/>" onclick="doImport()" />
+					value="<spring:message code="emport.import"/>" onclick="doImport()" />
 					<input id="cancelBtn" type="button"
-					value="<fmt:message key="common.cancel"/>" onclick="importCancel()"
+					value="<spring:message code="common.cancel"/>" onclick="importCancel()"
 					disabled="disabled" /></td>
 			</tr>
 			<tbody id="importMessages"></tbody>
@@ -320,7 +320,7 @@
 			</tr>
 		</table>
 	</div>
-				
+
 				</td>
 			</tr>
 
@@ -381,16 +381,16 @@
 				</select></td>
 			</tr>
 			<tr>
-				<td><fmt:message key="emport.exportProjectInstruction" /> <input
+				<td><spring:message code="emport.exportProjectInstruction" /> <input
 					id="exportBtn" type="button"
-					value="<fmt:message key="emport.exportProject"/>"
+					value="<spring:message code="emport.exportProject"/>"
 					onclick="doExport()" /></td>
 			</tr>
 			<tbody></tbody>
 			<tr>
 				<td></td>
 			</tr>
-			
+
 			<tr>
 				<td colspan="2" align="center">
 				<p></p>
@@ -406,13 +406,13 @@
 				</tr>
 
 				<tr>
-					<td><fmt:message key="emport.importProjectInstruction" /></td>
+					<td><spring:message code="emport.importProjectInstruction" /></td>
 				</tr>
 
 				<tr>
 					<td><input type="file" name="importFile" id="importFile" /> <input
 						id="importBtn" type="submit"
-						value="<fmt:message key="emport.send"/>" /></td>
+						value="<spring:message code="emport.send"/>" /></td>
 				</tr>
 
 				<tr>
@@ -422,17 +422,17 @@
 		</form>
 
 	</div>
-				
-				
+
+
 				</td>
 			</tr>
-			
-			
+
+
 		</table>
 	</div>
 
 	<div style="clear: both;">
-		<span class="formLabelRequired"><fmt:message key="emport.data" />
+		<span class="formLabelRequired"><spring:message code="emport.data" />
 		</span><br />
 		<textarea rows="40" cols="150" id="emportData"></textarea>
 	</div>
diff --git a/WebContent/WEB-INF/jsp/eventHandlers.jsp b/WebContent/WEB-INF/jsp/eventHandlers.jsp
index 5ec85f2a31..07cf2bd1dd 100644
--- a/WebContent/WEB-INF/jsp/eventHandlers.jsp
+++ b/WebContent/WEB-INF/jsp/eventHandlers.jsp
@@ -456,7 +456,13 @@
         var xid = $get("xid");
         var alias = $get("alias");
         var disabled = $get("disabled");
-        if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>) {
+        if (isEmpty(xid) && handlerId !== ${NEW_ID}){
+          let message = createValidationMessage("xid", "<spring:message code='validate.valueRestored'/>");
+          $set("xid", selectedHandlerNode.object.xid);
+          stopImageFader("saveImg");
+          showDwrMessages([message]);
+        } else {
+          if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>) {
             var emailList = emailRecipients.createRecipientArray();
             var escalList = escalRecipients.createRecipientArray();
             var inactiveList = inactiveRecipients.createRecipientArray();
@@ -464,28 +470,25 @@
                     selectedEventTypeNode.object.typeRef1, selectedEventTypeNode.object.typeRef2, handlerId, xid, alias,
                     disabled, emailList, $get("sendEscalation"), $get("escalationDelayType"), $get("escalationDelay"),
                     escalList, $get("sendInactive"), $get("inactiveOverride"), inactiveList, saveEventHandlerCB);
-        }
-        else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_SMS %>"/>) {
+          } else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_SMS %>"/>) {
             var smsList = smsRecipients.createRecipientArray();
             EventHandlersDwr.saveSmsEventHandler(selectedEventTypeNode.object.typeId,
                     selectedEventTypeNode.object.typeRef1, selectedEventTypeNode.object.typeRef2, handlerId, xid, alias, disabled, smsList, saveEventHandlerCB);
-        }
-        else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>) {
+          } else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>) {
             EventHandlersDwr.saveSetPointEventHandler(selectedEventTypeNode.object.typeId,
                     selectedEventTypeNode.object.typeRef1, selectedEventTypeNode.object.typeRef2, handlerId, xid, alias,
                     disabled, $get("targetPointSelect"), $get("activeAction"), $get("setPointValueActive"),
                     $get("activePointId"), $get("inactiveAction"), $get("setPointValueInactive"),
                     $get("inactivePointId"), saveEventHandlerCB);
-        }
-        else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_PROCESS %>"/>) {
+          } else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_PROCESS %>"/>) {
             EventHandlersDwr.saveProcessEventHandler(selectedEventTypeNode.object.typeId,
                     selectedEventTypeNode.object.typeRef1, selectedEventTypeNode.object.typeRef2, handlerId, xid,
                     alias, disabled, $get("activeProcessCommand"), $get("inactiveProcessCommand"), saveEventHandlerCB);
-        }
-        else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_SCRIPT %>"/>) {
+          } else if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_SCRIPT %>"/>) {
             EventHandlersDwr.saveScriptEventHandler(selectedEventTypeNode.object.typeId,
                     selectedEventTypeNode.object.typeRef1, selectedEventTypeNode.object.typeRef2, handlerId, xid,
                     alias, disabled, $get("activeScriptCommand"), $get("inactiveScriptCommand"), saveEventHandlerCB);
+          }
         }
     }
 
@@ -496,7 +499,6 @@
             showDwrMessages(response.messages, $("genericMessages"));
         else {
             var handler = response.data.handler;
-            setUserMessage("<fmt:message key="eventHandlers.saved"/>");
             if (!selectedHandlerNode) {
                 selectedHandlerNode = createHandlerNode(handler);
                 selectedEventTypeNode.addChild(selectedHandlerNode);
@@ -506,6 +508,7 @@
             else
                 $set(handler.id +"Msg", handler.message);
 
+            setUserMessage("<spring:message code="eventHandlers.saved"/>");
             selectedHandlerNode.object = handler;
         }
     }
@@ -552,7 +555,7 @@
 
   <table class="marB subPageHeader" id="eventHandlerHeader"><tr><td>
     <tag:img png="cog" title="eventHandlers.eventHandlers"/>
-    <span class="smallTitle"><fmt:message key="eventHandlers.eventHandlers"/></span>
+    <span class="smallTitle"><spring:message code="eventHandlers.eventHandlers"/></span>
     <tag:help id="eventHandlers"/>
   </td></tr></table>
 
@@ -560,19 +563,19 @@
     <tr>
       <td valign="top">
         <div class="borderDivPadded marR">
-          <span class="smallTitle"><fmt:message key="eventHandlers.types"/></span>
+          <span class="smallTitle"><spring:message code="eventHandlers.types"/></span>
           <div dojoType="TreeBasicController" widgetId="controller"></div>
           <img src="images/hourglass.png" id="loadingImg"/>
           <div id="tree" style="display:none;">
             <div dojoType="Tree" widgetId="eventTypeTree" listeners="controller" toggle="wipe">
-              <div dojoType="TreeNode" title="<img src='images/bell.png'/> <fmt:message key="eventHandlers.pointEventDetector"/>" widgetId="rootPoint"></div>
-              <div dojoType="TreeNode" title="<img src='images/clock.png'/> <fmt:message key="scheduledEvents.ses"/>" widgetId="rootScheduled"></div>
-              <div dojoType="TreeNode" title="<img src='images/multi_bell.png'/> <fmt:message key="compoundDetectors.compoundEventDetectors"/>" widgetId="rootCompound"></div>
-              <div dojoType="TreeNode" title="<fmt:message key="eventHandlers.dataSourceEvents"/>" widgetId="rootDataSource"></div>
-              <div dojoType="TreeNode" title="<fmt:message key="eventHandlers.publisherEvents"/>" widgetId="rootPublisher"></div>
-              <div dojoType="TreeNode" title="<img src='images/hammer.png'/> <fmt:message key="eventHandlers.maintenanceEvents"/>" widgetId="rootMaintenance"></div>
-              <div dojoType="TreeNode" title="<fmt:message key="eventHandlers.systemEvents"/>" widgetId="rootSystem"></div>
-              <div dojoType="TreeNode" title="<fmt:message key="eventHandlers.auditEvents"/>" widgetId="rootAudit"></div>
+              <div dojoType="TreeNode" title="<img src='images/bell.png'/> <spring:message code="eventHandlers.pointEventDetector"/>" widgetId="rootPoint"></div>
+              <div dojoType="TreeNode" title="<img src='images/clock.png'/> <spring:message code="scheduledEvents.ses"/>" widgetId="rootScheduled"></div>
+              <div dojoType="TreeNode" title="<img src='images/multi_bell.png'/> <spring:message code="compoundDetectors.compoundEventDetectors"/>" widgetId="rootCompound"></div>
+              <div dojoType="TreeNode" title="<spring:message code="eventHandlers.dataSourceEvents"/>" widgetId="rootDataSource"></div>
+              <div dojoType="TreeNode" title="<spring:message code="eventHandlers.publisherEvents"/>" widgetId="rootPublisher"></div>
+              <div dojoType="TreeNode" title="<img src='images/hammer.png'/> <spring:message code="eventHandlers.maintenanceEvents"/>" widgetId="rootMaintenance"></div>
+              <div dojoType="TreeNode" title="<spring:message code="eventHandlers.systemEvents"/>" widgetId="rootSystem"></div>
+              <div dojoType="TreeNode" title="<spring:message code="eventHandlers.auditEvents"/>" widgetId="rootAudit"></div>
             </div>
           </div>
         </div>
@@ -582,7 +585,7 @@
         <div id="handlerEditDiv" class="borderDivPadded" style="display:none;">
           <table width="100%">
             <tr>
-              <td class="smallTitle"><fmt:message key="eventHandlers.eventHandler"/></td>
+              <td class="smallTitle"><spring:message code="eventHandlers.eventHandler"/></td>
               <td align="right">
                 <tag:img id="deleteImg" png="delete" title="common.delete" onclick="deleteHandler();"/>
                 <tag:img id="saveImg" png="save" title="common.save" onclick="saveHandler();"/>
@@ -593,14 +596,14 @@
 
           <table width="100%">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.type"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.type"/></td>
               <td class="formField">
                 <select id="handlerTypeSelect" onchange="handlerTypeChanged()">
-                  <option value="<c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>"><fmt:message key="eventHandlers.type.email"/></option>
-                  <option value="<c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>"><fmt:message key="eventHandlers.type.setPoint"/></option>
-                  <option value="<c:out value="<%= EventHandlerVO.TYPE_PROCESS %>"/>"><fmt:message key="eventHandlers.type.process"/></option>
-                  <option value="<c:out value="<%= EventHandlerVO.TYPE_SCRIPT %>"/>"><fmt:message key="eventHandlers.type.script"/></option>
-                  <option value="<c:out value="<%= EventHandlerVO.TYPE_SMS %>"/>"><fmt:message key="eventHandlers.type.sms"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>"><spring:message code="eventHandlers.type.email"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>"><spring:message code="eventHandlers.type.setPoint"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.TYPE_PROCESS %>"/>"><spring:message code="eventHandlers.type.process"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.TYPE_SCRIPT %>"/>"><spring:message code="eventHandlers.type.script"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.TYPE_SMS %>"/>"><spring:message code="eventHandlers.type.sms"/></option>
                 </select>
                 <tag:img id="handler1Img" png="cog_wrench" title="eventHandlers.type.setPointHandler" style="display:none;"/>
                 <tag:img id="handler2Img" png="cog_email" title="eventHandlers.type.emailHandler" style="display:none;"/>
@@ -614,17 +617,17 @@
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField"><input type="text" id="xid"/></td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.alias"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.alias"/></td>
               <td class="formField"><input id="alias" type="text"/></td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.disabled"/></td>
+              <td class="formLabelRequired"><spring:message code="common.disabled"/></td>
               <td class="formField"><input type="checkbox" id="disabled"/></td>
             </tr>
 
@@ -633,51 +636,51 @@
 
           <table id="handler<c:out value="<%= EventHandlerVO.TYPE_SET_POINT %>"/>" style="display:none" width="100%">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.target"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.target"/></td>
               <td class="formField">
                 <select id="targetPointSelect" onchange="targetPointSelectChanged()"></select>
               </td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.activeAction"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.activeAction"/></td>
               <td class="formField">
                 <select id="activeAction" onchange="activeActionChanged()">
-                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_NONE %>"/>"><fmt:message key="eventHandlers.action.none"/></option>
-                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_POINT_VALUE %>"/>"><fmt:message key="eventHandlers.action.point"/></option>
-                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>"><fmt:message key="eventHandlers.action.static"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_NONE %>"/>"><spring:message code="eventHandlers.action.none"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_POINT_VALUE %>"/>"><spring:message code="eventHandlers.action.point"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>"><spring:message code="eventHandlers.action.static"/></option>
                 </select>
               </td>
             </tr>
 
             <tr id="activePointIdRow">
-              <td class="formLabel"><fmt:message key="eventHandlers.sourcePoint"/></td>
+              <td class="formLabel"><spring:message code="eventHandlers.sourcePoint"/></td>
               <td class="formField"><select id="activePointId"></select></td>
             </tr>
 
             <tr id="activeValueToSetRow">
-              <td class="formLabel"><fmt:message key="eventHandlers.valueToSet"/></td>
+              <td class="formLabel"><spring:message code="eventHandlers.valueToSet"/></td>
               <td class="formField" id="activeValueToSetContent"></td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.inactiveAction"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.inactiveAction"/></td>
               <td class="formField">
                 <select id="inactiveAction" onchange="inactiveActionChanged()">
-                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_NONE %>"/>"><fmt:message key="eventHandlers.action.none"/></option>
-                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_POINT_VALUE %>"/>"><fmt:message key="eventHandlers.action.point"/></option>
-                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>"><fmt:message key="eventHandlers.action.static"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_NONE %>"/>"><spring:message code="eventHandlers.action.none"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_POINT_VALUE %>"/>"><spring:message code="eventHandlers.action.point"/></option>
+                  <option value="<c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>"><spring:message code="eventHandlers.action.static"/></option>
                 </select>
               </td>
             </tr>
 
             <tr id="inactivePointIdRow">
-              <td class="formLabel"><fmt:message key="eventHandlers.sourcePoint"/></td>
+              <td class="formLabel"><spring:message code="eventHandlers.sourcePoint"/></td>
               <td class="formField"><select id="inactivePointId"></select></td>
             </tr>
 
             <tr id="inactiveValueToSetRow">
-              <td class="formLabel"><fmt:message key="eventHandlers.valueToSet"/></td>
+              <td class="formLabel"><spring:message code="eventHandlers.valueToSet"/></td>
               <td class="formField" id="inactiveValueToSetContent"></td>
             </tr>
           </table>
@@ -688,12 +691,12 @@
             <tr><td class="horzSeparator" colspan="2"></td></tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.escal"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.escal"/></td>
               <td class="formField"><input id="sendEscalation" type="checkbox" onclick="sendEscalationChanged()"/></td>
             </tr>
 
             <tr id="escalationAddresses1">
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.escalPeriod"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.escalPeriod"/></td>
               <td class="formField">
                 <input id="escalationDelay" type="text" class="formShort"/>
                 <select id="escalationDelayType">
@@ -707,12 +710,12 @@
             <tr><td class="horzSeparator" colspan="2"></td></tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.inactiveNotif"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.inactiveNotif"/></td>
               <td class="formField"><input id="sendInactive" type="checkbox" onclick="sendInactiveChanged()"/></td>
             </tr>
 
             <tr id="inactiveAddresses1">
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.inactiveOverride"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.inactiveOverride"/></td>
               <td class="formField"><input id="inactiveOverride" type="checkbox" onclick="inactiveOverrideChanged()"/></td>
             </tr>
 
@@ -725,7 +728,7 @@
           
           <table id="handler<c:out value="<%= EventHandlerVO.TYPE_PROCESS %>"/>" style="display:none" width="100%">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.activeCommand"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.activeCommand"/></td>
               <td class="formField">
                 <input type="text" id="activeProcessCommand" class="formLong"/>
                 <tag:img png="cog_go" onclick="testProcessCommand('activeProcessCommand')" title="eventHandlers.commandTest.title"/>
@@ -733,7 +736,7 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.inactiveCommand"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.inactiveCommand"/></td>
               <td class="formField">
                 <input type="text" id="inactiveProcessCommand" class="formLong"/>
                 <tag:img png="cog_go" onclick="testProcessCommand('inactiveProcessCommand')" title="eventHandlers.commandTest.title"/>
@@ -743,7 +746,7 @@
           
           <table id="handler<c:out value="<%= EventHandlerVO.TYPE_SCRIPT %>"/>" style="display:none" width="100%">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.activeScript"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.activeScript"/></td>
               <td class="formField">
               	<select id="activeScriptCommand"></select>
                 <tag:img png="cog_go" onclick="testScriptCommand('activeScriptCommand')" title="eventHandlers.commandTest.title"/>
@@ -751,7 +754,7 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="eventHandlers.inactiveScript"/></td>
+              <td class="formLabelRequired"><spring:message code="eventHandlers.inactiveScript"/></td>
               <td class="formField">
               	<select id="inactiveScriptCommand"></select>
                 <tag:img png="cog_go" onclick="testScriptCommand('inactiveScriptCommand')" title="eventHandlers.commandTest.title"/>
diff --git a/WebContent/WEB-INF/jsp/events.jsp b/WebContent/WEB-INF/jsp/events.jsp
index 919977eb39..4c74a2dccf 100644
--- a/WebContent/WEB-INF/jsp/events.jsp
+++ b/WebContent/WEB-INF/jsp/events.jsp
@@ -61,7 +61,7 @@
     
     function doSearchOld() {
     	setDisabled("searchBtn", true);
-    	$set("searchMessage", "<fmt:message key="events.search.searching"/>");
+    	$set("searchMessage", "<spring:message code="events.search.searching"/>");
     	var eventId = parseInt($get("eventId"));
     	var maxResults = parseInt($get("maxResults"));
         EventsDwr.searchOld(eventId, $get("eventSourceType"), $get("eventStatus"), $get("alarmLevel"),
@@ -74,7 +74,7 @@
 
     function doSearch(page, date) {
         setDisabled("searchBtn", true);
-        $set("searchMessage", "<fmt:message key="events.search.searching"/>");
+        $set("searchMessage", "<spring:message code="events.search.searching"/>");
     	var eventId = parseInt($get("eventId"));
         EventsDwr.search(eventId, $get("eventSourceType"), $get("eventStatus"), $get("alarmLevel"),
                 $get("keywords"), page.value, date.value, function(results) {
@@ -145,11 +145,11 @@
         let messages = [];
 
         if (!isValid(parametersToCheck.eventId)) {
-            let message = createValidationMessage("eventId", "<fmt:message key='badIntegerFormat'/>");
+            let message = createValidationMessage("eventId", "<spring:message code='badIntegerFormat'/>");
             messages.push(message);
         }
         if(!isValid(parametersToCheck.maxResults)) {
-            let message = createValidationMessage("maxResults", "<fmt:message key='badIntegerFormat'/>");
+            let message = createValidationMessage("maxResults", "<spring:message code='badIntegerFormat'/>");
             messages.push(message)
         }
         return messages;
@@ -178,62 +178,63 @@
   <div class="borderDiv marB" style="float:left;">
     <div class="smallTitle titlePadding" style="float:left;">
       <tag:img png="flag_white" title="events.alarms"/>
-      <fmt:message key="events.pending"/>
+      <spring:message code="events.pending"/>
     </div>
     <div id="ackAllDiv" class="titlePadding" style="display:none;float:right;">
-      <fmt:message key="events.acknowledgeAll"/>
+      <spring:message code="events.acknowledgeAll"/>
       <tag:img png="tick" onclick="MiscDwr.acknowledgeAllPendingEvents()" title="events.acknowledgeAll"/>&nbsp;
-      <fmt:message key="events.silenceAll"/>
+      <spring:message code="events.silenceAll"/>
       <tag:img png="sound_mute" onclick="silenceAll()" title="events.silenceAll"/><br/>
     </div>
     <div id="pendingAlarms" style="clear:both;"></div>
     <div id="noAlarms" style="display:none;padding:6px;text-align:center;">
-      <b><fmt:message key="events.emptyList"/></b>
+      <b><spring:message code="events.emptyList"/></b>
     </div>
     <div id="hourglass" style="padding:6px;text-align:center;"><tag:img png="hourglass"/></div>
   </div>
   
   <div class="borderDiv" style="clear:left;float:left;" id="eventSearchForm">
-    <div class="smallTitle titlePadding"><fmt:message key="events.search"/></div>
+    <div class="smallTitle titlePadding"><spring:message code="events.search"/></div>
     <div>
       <table>
         <tr>
-          <td id="eventIdLabel" class="formLabel"><fmt:message key="events.id"/></td>
+          <td id="eventIdLabel" class="formLabel"><spring:message code="events.id"/></td>
           <td class="formField"><input id="eventId" type="text"></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="events.search.type"/></td>
+          <td class="formLabel"><spring:message code="events.search.type"/></td>
           <td class="formField">
             <select id="eventSourceType">
-              <option value="-1"><fmt:message key="common.all"/></option>
-              <option value="<c:out value="<%= EventType.EventSources.DATA_POINT %>"/>"><fmt:message key="eventHandlers.pointEventDetector"/></option>
-              <option value="<c:out value="<%= EventType.EventSources.SCHEDULED %>"/>"><fmt:message key="scheduledEvents.ses"/></option>
-              <option value="<c:out value="<%= EventType.EventSources.COMPOUND %>"/>"><fmt:message key="compoundDetectors.compoundEventDetectors"/></option>
-              <option value="<c:out value="<%= EventType.EventSources.DATA_SOURCE %>"/>"><fmt:message key="eventHandlers.dataSourceEvents"/></option>
-              <option value="<c:out value="<%= EventType.EventSources.PUBLISHER %>"/>"><fmt:message key="eventHandlers.publisherEvents"/></option>
-              <option value="<c:out value="<%= EventType.EventSources.MAINTENANCE %>"/>"><fmt:message key="eventHandlers.maintenanceEvents"/></option>
-              <option value="<c:out value="<%= EventType.EventSources.SYSTEM %>"/>"><fmt:message key="eventHandlers.systemEvents"/></option>
-              <option value="<c:out value="<%= EventType.EventSources.AUDIT %>"/>"><fmt:message key="eventHandlers.auditEvents"/></option>
+              <option value="-1"><spring:message code="common.all"/></option>
+              <option value="<c:out value="<%= EventType.EventSources.DATA_POINT %>"/>"><spring:message code="eventHandlers.pointEventDetector"/></option>
+              <option value="<c:out value="<%= EventType.EventSources.SCHEDULED %>"/>"><spring:message code="scheduledEvents.ses"/></option>
+              <option value="<c:out value="<%= EventType.EventSources.COMPOUND %>"/>"><spring:message code="compoundDetectors.compoundEventDetectors"/></option>
+              <option value="<c:out value="<%= EventType.EventSources.DATA_SOURCE %>"/>"><spring:message code="eventHandlers.dataSourceEvents"/></option>
+              <option value="<c:out value="<%= EventType.EventSources.PUBLISHER %>"/>"><spring:message code="eventHandlers.publisherEvents"/></option>
+              <option value="<c:out value="<%= EventType.EventSources.MAINTENANCE %>"/>"><spring:message code="eventHandlers.maintenanceEvents"/></option>
+              <option value="<c:out value="<%= EventType.EventSources.SYSTEM %>"/>"><spring:message code="eventHandlers.systemEvents"/></option>
+              <option value="<c:out value="<%= EventType.EventSources.AUDIT %>"/>"><spring:message code="eventHandlers.auditEvents"/></option>
             </select>
           </td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="common.status"/></td>
+          <td class="formLabel"><spring:message code="common.status"/></td>
           <td class="formField">
             <select id="eventStatus">
-              <option value="<c:out value="<%= EventsDwr.STATUS_ALL %>"/>"><fmt:message key="common.all"/></option>
-              <option value="<c:out value="<%= EventsDwr.STATUS_ACTIVE %>"/>"><fmt:message key="common.active"/></option>
-              <option value="<c:out value="<%= EventsDwr.STATUS_RTN %>"/>"><fmt:message key="event.rtn.rtn"/></option>
-              <option value="<c:out value="<%= EventsDwr.STATUS_NORTN %>"/>"><fmt:message key="common.nortn"/></option>
+              <option value="<c:out value="<%= EventsDwr.STATUS_ALL %>"/>"><spring:message code="common.all"/></option>
+              <option value="<c:out value="<%= EventsDwr.STATUS_ACTIVE %>"/>"><spring:message code="common.active"/></option>
+              <option value="<c:out value="<%= EventsDwr.STATUS_RTN %>"/>"><spring:message code="event.rtn.rtn"/></option>
+              <option value="<c:out value="<%= EventsDwr.STATUS_NORTN %>"/>"><spring:message code="common.nortn"/></option>
+              <option value="<c:out value="<%= EventsDwr.STATUS_ASSIGNEE %>"/>"><spring:message code="common.assignee"/></option>
             </select>
           </td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="common.alarmLevel"/></td>
+          <td class="formLabel"><spring:message code="common.alarmLevel"/></td>
           <td class="formField"><select id="alarmLevel"><tag:alarmLevelOptions allOption="true"/></select></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="events.search.keywords"/></td>
+          <td class="formLabel"><spring:message code="events.search.keywords"/></td>
           <td class="formField"><input id="keywords" type="text"/></td>
         </tr>
         
@@ -246,14 +247,14 @@
 <!--         </tr> -->
 
 		<tr>
-          <td id="maxResultsLabel" class="formLabel"><fmt:message key="events.search.maxResults"/></td>
+          <td id="maxResultsLabel" class="formLabel"><spring:message code="events.search.maxResults"/></td>
           <td class="formField"><input id="maxResults" type="text" value="100"/></td>
         </tr>
 		
         
         <tr>
           <td colspan="2" align="center">
-            <input id="searchBtn" type="button" value="<fmt:message key="events.search.search"/>" onclick="newSearch()"/>
+            <input id="searchBtn" type="button" value="<spring:message code="events.search.search"/>" onclick="newSearch()"/>
             <span id="searchMessage" class="formError"></span>
           </td>
         </tr>
diff --git a/WebContent/WEB-INF/jsp/help.jsp b/WebContent/WEB-INF/jsp/help.jsp
index 7fd9889114..08d4867136 100644
--- a/WebContent/WEB-INF/jsp/help.jsp
+++ b/WebContent/WEB-INF/jsp/help.jsp
@@ -18,12 +18,12 @@
 --%>
 <%@ include file="/WEB-INF/jsp/include/tech.jsp" %>
 <tag:page>
-  <div class="smallTitle"><fmt:message key="common.help"/></div>
+  <div class="smallTitle"><spring:message code="common.help"/></div>
   <br/>
   
   <div id="help">
-    <c:if test="${sessionUser.firstLogin}"><h2><fmt:message key="dox.welcomeToMango"/>!</h2></c:if>
-    <c:set var="filepath">/WEB-INF/dox/<fmt:message key="dox.dir"/>/help.html</c:set>
+    <c:if test="${sessionUser.firstLogin}"><h2><spring:message code="dox.welcomeToMango"/>!</h2></c:if>
+    <c:set var="filepath">/WEB-INF/dox/<spring:message code="dox.dir"/>/help.html</c:set>
     <jsp:include page="${filepath}"/>
   </div>
 </tag:page>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/import_result.jsp b/WebContent/WEB-INF/jsp/import_result.jsp
index 4844cea7ba..85faae8257 100644
--- a/WebContent/WEB-INF/jsp/import_result.jsp
+++ b/WebContent/WEB-INF/jsp/import_result.jsp
@@ -30,13 +30,13 @@
     }
 
     function loadProject() {
-		resp = confirm("<fmt:message key="emport.confirmImport"/>");
+		resp = confirm("<spring:message code="emport.confirmImport"/>");
 
 		if(!resp)
 			return;
         
     	setDisabled("loadBtn", true);
-    	messages = [createValidationMessage("importMessages","<fmt:message key="emport.importInit"/>")];
+    	messages = [createValidationMessage("importMessages","<spring:message code="emport.importInit"/>")];
 		showDwrMessages(messages);
 		hide("eventsRow");
 		hide("subHeader");
@@ -46,7 +46,7 @@
                     if(success) {
                     	importUpdate();
                     } else {
-                    	messages = [createValidationMessage("importMessages","<fmt:message key="emport.importFailed"/>")];
+                    	messages = [createValidationMessage("importMessages","<spring:message code="emport.importFailed"/>")];
                 		showDwrMessages(messages);
                     }
                 	
@@ -60,7 +60,7 @@
             	return;
             }
             
-            $set("alternateMessage", "<fmt:message key="emport.importProgress"/>");
+            $set("alternateMessage", "<spring:message code="emport.importProgress"/>");
             setDisabled("loadBtn", true);
             showDwrMessages(response.messages, $("importMessages"));
             
@@ -68,11 +68,11 @@
                 setDisabled("loadBtn", false);
                 
                 if (response.data.cancelled)
-                    $set("alternateMessage", "<fmt:message key="emport.importCancelled"/>");
+                    $set("alternateMessage", "<spring:message code="emport.importCancelled"/>");
                 else {
                 	window.onunload = function() {};
-                	$set("alternateMessage", "<fmt:message key="emport.importComplete"/>");
-                	alert("<fmt:message key="emport.importCompleteWarn"/>");
+                	$set("alternateMessage", "<spring:message code="emport.importComplete"/>");
+                	alert("<spring:message code="emport.importCompleteWarn"/>");
                 	window.location = "logout.htm";
                 }
                     
@@ -88,7 +88,7 @@
    <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
   	<c:if test="${!empty errorMessages}">
   		<tr>
-  			<td> <fmt:message key="emport.errorMessage"/> </td>
+  			<td> <spring:message code="emport.errorMessage"/> </td>
   		</tr>
   		
   		<tr> 
@@ -99,23 +99,23 @@
   	</c:if>
   	<c:if test="${empty errorMessages}">
   		<td>
-      		<span class="smallTitle"><fmt:message key="emport.importProjectTitle"/></span>
+      		<span class="smallTitle"><spring:message code="emport.importProjectTitle"/></span>
       		<tag:help id="importProject"/>
       	</td>
   		<tr>
-      		<td> <b> <fmt:message key="emport.projectName"/> </b>   </td>
+      		<td> <b> <spring:message code="emport.projectName"/> </b>   </td>
     		<td> ${projectName} </td>
     	</tr>
     	<tr>
-      		<td> <b> <fmt:message key="emport.projectDescription"/> </b>  </td>
+      		<td> <b> <spring:message code="emport.projectDescription"/> </b>  </td>
     		<td>  ${projectDescription} </td>
     	</tr>
     	<tr>
-      		<td> <b> <fmt:message key="emport.serverVersion"/> </b>  </td>
+      		<td> <b> <spring:message code="emport.serverVersion"/> </b>  </td>
     		<td>  ${projectServerVersion} </td>
     	</tr>
     	<tr>
-      		<td> <b> <fmt:message key="emport.exportDate"/> </b>   </td>
+      		<td> <b> <spring:message code="emport.exportDate"/> </b>   </td>
     		<td> ${exportDate} </td>
     	</tr>
     	<tbody id="importMessages"></tbody>
@@ -123,7 +123,7 @@
     	<tr>
     	   <td> </td>
       	   <td> 
-      	     <input id="loadBtn" type="button" value="<fmt:message key="emport.importButton"/>" onclick="loadProject();"/>
+      	     <input id="loadBtn" type="button" value="<spring:message code="emport.importButton"/>" onclick="loadProject();"/>
       	   </td>
     	</tr>
   	</c:if>
diff --git a/WebContent/WEB-INF/jsp/include/compoundEditor.jsp b/WebContent/WEB-INF/jsp/include/compoundEditor.jsp
index 45974f76f3..0d36523bce 100644
--- a/WebContent/WEB-INF/jsp/include/compoundEditor.jsp
+++ b/WebContent/WEB-INF/jsp/include/compoundEditor.jsp
@@ -51,18 +51,18 @@
 				</table>
 				<table>
 					<tr>
-        				<td class="formLabel"><fmt:message key="viewEdit.position.x"/></td>
+        				<td class="formLabel"><spring:message code="viewEdit.position.x"/></td>
         				<td class="formField"><input id="compoundPositionX" type="number" default="0" min="0"/></td>
       				</tr>
       				<tr>
-        				<td class="formLabel"><fmt:message key="viewEdit.position.y"/></td>
+        				<td class="formLabel"><spring:message code="viewEdit.position.y"/></td>
         				<td class="formField"><input id="compoundPositionY" type="number" default="0" min="0"/></td>
       				</tr>
 				</table>
 				<table>
 					<tr>
 						<td class="formLabelRequired">
-							<fmt:message key="viewEdit.compound.name"/>
+							<spring:message code="viewEdit.compound.name"/>
 						</td>
 						<td class="formField">
 							<input id="compoundName" type="text"/>
@@ -71,7 +71,7 @@
 					<tbody id="simpleCompoundAttrs">
 						<tr>
 							<td class="formLabel">
-								<fmt:message key="viewEdit.compound.backgroundColour"/>
+								<spring:message code="viewEdit.compound.backgroundColour"/>
 							</td>
 							<td class="formField">
 								<input id="compoundBackgroundColour" type="text"/>
@@ -81,7 +81,7 @@
 					<tbody id="imageChartAttrs">
 						<tr>
 							<td class="formLabelRequired">
-								<fmt:message key="viewEdit.compound.width"/>
+								<spring:message code="viewEdit.compound.width"/>
 							</td>
 							<td class="formField">
 								<input id="imageChartWidth" type="text" />
@@ -89,7 +89,7 @@
 						</tr>
 						<tr>
 							<td class="formLabelRequired">
-								<fmt:message key="viewEdit.compound.height" />
+								<spring:message code="viewEdit.compound.height" />
 							</td>
 							<td class="formField">
 								<input id="imageChartHeight" type="text" />
@@ -97,7 +97,7 @@
 						</tr>
 						<tr>
 							<td class="formLabelRequired">
-								<fmt:message key="viewEdit.compound.duration"/>
+								<spring:message code="viewEdit.compound.duration"/>
 							</td>
 							<td class="formField">
 								<input type="text" id="imageChartDurationPeriods" class="formShort" />
@@ -111,15 +111,15 @@
 					<tbody id="enhancedImageChartAttrs">
 						<tr>
 							<td class="formLabelRequired">
-								<fmt:message key="viewEdit.compound.type"/>
+								<spring:message code="viewEdit.compound.type"/>
 							</td>
 							<td class="formField">
 								<input name="enhancedImageChartType" type="radio" 
 									value="<%= EnhancedImageChartType.STATIC.name() %>">
-								<fmt:message key="viewEdit.compound.type.static" /></input> 
+								<spring:message code="viewEdit.compound.type.static" /></input>
 								<input name="enhancedImageChartType" type="radio"
 									value="<%= EnhancedImageChartType.DYNAMIC.name() %>">
-								<fmt:message key="viewEdit.compound.type.dynamic" /></input>
+								<spring:message code="viewEdit.compound.type.dynamic" /></input>
 							</td>
 						</tr>
 					</tbody>
@@ -308,17 +308,17 @@
             	functions = [
                     (data) => { return data.description; },
                     (data) => { return '<select id="compoundPointSelect'+ data.id +'"></select></br></br>' + 
-                    	'<label for="compoundPointColor'+ data.id +'"><span><fmt:message key="viewEdit.compound.point.color"/></span></label>' +
+                    	'<label for="compoundPointColor'+ data.id +'"><span><spring:message code="viewEdit.compound.point.color"/></span></label>' +
                     	'<input id="compoundPointColor'+ data.id +'" type="hidden" value="' + data.viewComponent.color + '"/>' +
-                    	'<label for="compoundPointStrokeWidth'+ data.id +'"><span><fmt:message key="viewEdit.compound.point.strokeWidth"/></span></label>' + 
+                    	'<label for="compoundPointStrokeWidth'+ data.id +'"><span><spring:message code="viewEdit.compound.point.strokeWidth"/></span></label>' +
                     	'<input id="compoundPointStrokeWidth'+ data.id +'" value="' + data.viewComponent.strokeWidth + '" style="width: 20%;"/>'; },
-                    (data) => { return '<label for="compoundPointName'+ data.id +'"><span><fmt:message key="viewEdit.compound.point.alias"/></span></label>' +
+                    (data) => { return '<label for="compoundPointName'+ data.id +'"><span><spring:message code="viewEdit.compound.point.alias"/></span></label>' +
                     	'<input id="compoundPointName' + data.id + '" type="text" value="' + defaultIfBlank(data.viewComponent.alias, "") + '"/></br>' +
                     	'<input name="compoundPointLineType'+ data.id +'" type="radio" ' + ((data.viewComponent.lineType === "<%= EnhancedPointLineType.LINE.name() %>" ) ? 'checked="checked"' : '')  +
-                   		' value="<%= EnhancedPointLineType.LINE.name() %>"><fmt:message key="viewEdit.compound.point.lineType.line"/></input>' +
+                   		' value="<%= EnhancedPointLineType.LINE.name() %>"><spring:message code="viewEdit.compound.point.lineType.line"/></input>' +
           				'<input name="compoundPointLineType'+ data.id +'" type="radio" ' + ((data.viewComponent.lineType === "<%= EnhancedPointLineType.SPLINE.name() %>" ) ? 'checked="checked"' : '')  +
-						' value="<%= EnhancedPointLineType.SPLINE.name() %>"><fmt:message key="viewEdit.compound.point.lineType.spline"/></input>' + 
-						'<input id="compoundPointShowPoints' + data.id + '" type="checkbox" ' + (data.viewComponent.showPoints ? 'checked':'') + '><fmt:message key="viewEdit.compound.point.showPoints"/></input>'; }
+						' value="<%= EnhancedPointLineType.SPLINE.name() %>"><spring:message code="viewEdit.compound.point.lineType.spline"/></input>' +
+						'<input id="compoundPointShowPoints' + data.id + '" type="checkbox" ' + (data.viewComponent.showPoints ? 'checked':'') + '><spring:message code="viewEdit.compound.point.showPoints"/></input>'; }
                 ];
             }
             
diff --git a/WebContent/WEB-INF/jsp/include/customEditor.jsp b/WebContent/WEB-INF/jsp/include/customEditor.jsp
index 41910679d4..54b4ff321a 100644
--- a/WebContent/WEB-INF/jsp/include/customEditor.jsp
+++ b/WebContent/WEB-INF/jsp/include/customEditor.jsp
@@ -35,37 +35,43 @@
     <table>
       <tbody id="customEditor_alarmlist" style="display:none;">
       	<tr>
-          <td class="formLabel"><fmt:message key="common.alarmLevel"/></td>
+          <td class="formLabel"><spring:message code="common.alarmLevel"/></td>
           <td class="formField"><select id="customEditorAlarmListMinAlarmLevel"><tag:alarmLevelOptions allOption="true"/></select></td>
         </tr>
       	<tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.maxListSize"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.maxListSize"/></td>
           <td class="formField"><input id="customEditorAlarmListMaxListSize" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.width"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.width"/></td>
           <td class="formField"><input id="customEditorAlarmListWidth" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="viewEdit.graphic.hideIdColumn"/></td>
+          <td class="formLabel"><spring:message code="viewEdit.graphic.hideIdColumn"/></td>
           <td class="formField"><input id="customEditorAlarmListIdColumn" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="viewEdit.graphic.hideAlarmLevelColumn"/></td>
+          <td class="formLabel"><spring:message code="viewEdit.graphic.hideAlarmLevelColumn"/></td>
           <td class="formField"><input id="customEditorAlarmListAlarmLevelColumn" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="viewEdit.graphic.hideTimestampColumn"/></td>
+          <td class="formLabel"><spring:message code="viewEdit.graphic.hideTimestampColumn"/></td>
           <td class="formField"><input id="customEditorAlarmListTimestampColumn" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="viewEdit.graphic.hideInactivityColumn"/></td>
+          <td class="formLabel"><spring:message code="viewEdit.graphic.hideInactivityColumn"/></td>
           <td class="formField"><input id="customEditorAlarmListInactivityColumn" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabel"><fmt:message key="viewEdit.graphic.hideAckColumn"/></td>
+          <td class="formLabel"><spring:message code="viewEdit.graphic.hideAckColumn"/></td>
           <td class="formField"><input id="customEditorAlarmListAckColumn" type="checkbox"/></td>
         </tr>
+        <c:if test="${isEventAssignEnabled}">
+            <tr>
+              <td class="formLabel"><spring:message code="viewEdit.graphic.hideAssigneeColumn"/></td>
+              <td class="formField"><input id="customEditorAlarmListAssigneeColumn" type="checkbox"/></td>
+            </tr>
+        </c:if>
       </tbody>
       
       <tbody id="customEditor_button" style="display:none;">
@@ -103,6 +109,10 @@
                 $set("customEditorAlarmListInactivityColumn",comp.hideInactivityColumn);
                 $set("customEditorAlarmListAckColumn",comp.hideAckColumn);
 
+                if('${isEventAssignEnabled}' !== '') {
+                    $set("customEditorAlarmListAssigneeColumn",comp.hideAssigneeColumn);
+                }
+
             } else if(comp.typeName == "yourCustomComponent") {
 
             }
@@ -120,13 +130,14 @@
         
         this.save = function() {
             //hideContextualMessages("graphicRendererEditorPopup");
+            let customEditorAlarmListAssigneeColumn = '${isEventAssignEnabled}' !== '' ? $get("customEditorAlarmListAssigneeColumn") : false;
             if (customEditor.typeName == "alarmlist")
             	ViewDwr.saveAlarmListComponent(customEditor.componentId,
                     	$get("customEditorAlarmListMinAlarmLevel"), $get("customEditorAlarmListMaxListSize"),
                         $get("customEditorAlarmListWidth"),$get("customEditorAlarmListIdColumn"),
                         $get("customEditorAlarmListAlarmLevelColumn"),$get("customEditorAlarmListTimestampColumn"),
                         $get("customEditorAlarmListInactivityColumn"),$get("customEditorAlarmListAckColumn"),
-                        viewId, customEditor.saveCB);
+                        viewId, customEditorAlarmListAssigneeColumn, customEditor.saveCB);
             else if (customEditor.typeName == "yourCustomComponent")
             	alert('save your custom component component!');
             
diff --git a/WebContent/WEB-INF/jsp/include/graphicRendererEditor.jsp b/WebContent/WEB-INF/jsp/include/graphicRendererEditor.jsp
index 9b6a8ea983..d2a4aab5fe 100644
--- a/WebContent/WEB-INF/jsp/include/graphicRendererEditor.jsp
+++ b/WebContent/WEB-INF/jsp/include/graphicRendererEditor.jsp
@@ -35,24 +35,24 @@
     <table>
       <tbody id="graphicRenderer_analogGraphic" style="display:none;">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.min"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.min"/></td>
           <td class="formField"><input id="graphicRendererAnalogMin" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.max"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.max"/></td>
           <td class="formField"><input id="graphicRendererAnalogMax" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.displayText"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.displayText"/></td>
           <td class="formField"><input id="graphicRendererAnalogDisplayText" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.imageSet"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.imageSet"/></td>
           <td>
             <select id="graphicRendererAnalogImageSet" onchange="graphicRendererEditor.updateSampleImageSet(this)">
               <option value=""></option>
               <c:forEach items="${imageSets}" var="imageSet">
-                <option value="${imageSet.id}">${imageSet.name} (${imageSet.imageCount} <fmt:message key="viewEdit.graphic.images"/>)</option>
+                <option value="${imageSet.id}">${imageSet.name} (${imageSet.imageCount} <spring:message code="viewEdit.graphic.images"/>)</option>
               </c:forEach>
             </select><br/>
             <img id="graphicRendererAnalogImageSetSample"/>
@@ -62,29 +62,29 @@
       
       <tbody id="graphicRenderer_binaryGraphic" style="display:none;">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.displayText"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.displayText"/></td>
           <td class="formField"><input id="graphicRendererBinaryDisplayText" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.imageSet"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.imageSet"/></td>
           <td>
             <select id="graphicRendererBinaryImageSet" onchange="graphicRendererEditor.displayBinaryImages($get(this));">
               <option value=""></option>
               <c:forEach items="${imageSets}" var="imageSet">
-                <option value="${imageSet.id}">${imageSet.name} (${imageSet.imageCount} <fmt:message key="viewEdit.graphic.images"/>)</option>
+                <option value="${imageSet.id}">${imageSet.name} (${imageSet.imageCount} <spring:message code="viewEdit.graphic.images"/>)</option>
               </c:forEach>
             </select>
           </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.zero"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.zero"/></td>
           <td class="formField">
             <div id="graphicRendererBinaryImageSetZero" style="width:200px; overflow:auto; white-space:nowrap;"></div>
             <input type="hidden" id="graphicRendererBinaryImageSetZeroMsg"/>
           </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.one"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.one"/></td>
           <td class="formField">
             <div id="graphicRendererBinaryImageSetOne" style="width:200px; overflow:auto; white-space:nowrap;"></div>
             <input type="hidden" id="graphicRendererBinaryImageSetOneMsg"/>
@@ -94,19 +94,19 @@
       
       <tbody id="graphicRenderer_dynamicGraphic" style="display:none;">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.min"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.min"/></td>
           <td class="formField"><input id="graphicRendererDynamicMin" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.max"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.max"/></td>
           <td class="formField"><input id="graphicRendererDynamicMax" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.displayText"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.displayText"/></td>
           <td class="formField"><input id="graphicRendererDynamicDisplayText" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.dynamicImage"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.dynamicImage"/></td>
           <td>
             <select id="graphicRendererDynamicImage" onchange="graphicRendererEditor.updateSampleDynamicImage(this)">
               <option value=""></option>
@@ -121,22 +121,22 @@
       
       <tbody id="graphicRenderer_multistateGraphic" style="display:none;">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.displayText"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.displayText"/></td>
           <td class="formField"><input id="graphicRendererMultistateDisplayText" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.imageSet"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.imageSet"/></td>
           <td>
             <select id="graphicRendererMultistateImageSet" onchange="graphicRendererEditor.displayMultistateImages($get(this));">
               <option value=""></option>
               <c:forEach items="${imageSets}" var="imageSet">
-                <option value="${imageSet.id}">${imageSet.name} (${imageSet.imageCount} <fmt:message key="viewEdit.graphic.images"/>)</option>
+                <option value="${imageSet.id}">${imageSet.name} (${imageSet.imageCount} <spring:message code="viewEdit.graphic.images"/>)</option>
               </c:forEach>
             </select>
           </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.state"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.state"/></td>
           <td class="formField" id="graphicRendererMultistateImageSetList">
           </td>
         </tr>
@@ -145,48 +145,48 @@
       <tbody id="graphicRenderer_script" style="display:none;">
         <tr>
           <td colspan="2">
-            <span class="formLabelRequired"><fmt:message key="viewEdit.graphic.script"/></span><br/>
+            <span class="formLabelRequired"><spring:message code="viewEdit.graphic.script"/></span><br/>
             <span class="formField"><textarea id="graphicRendererScriptScript" rows="10" cols="50"></textarea></span>
           </td>
         </tr>
       </tbody>
       
       <tbody id="graphicRenderer_simpleImage" style="display:none;">
-        <tr><td class="formLabelRequired"><fmt:message key="viewEdit.graphic.noConfig"/></td></tr>
+        <tr><td class="formLabelRequired"><spring:message code="viewEdit.graphic.noConfig"/></td></tr>
       </tbody>
       
       <tbody id="graphicRenderer_simple" style="display:none;">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.displayPointName"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.displayPointName"/></td>
           <td class="formField"><input id="graphicRendererSimpleDisplayPointName" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.styleAttribute"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.styleAttribute"/></td>
           <td class="formField"><input id="graphicRendererSimpleStyleAttribute" type="text"/></td>
         </tr>
       </tbody>
       
       <tbody id="graphicRenderer_thumbnailImage" style="display:none;">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.scale"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.scale"/></td>
           <td class="formField"><input id="graphicRendererThumbnailScalePercent" type="text"/></td>
         </tr>
       </tbody>
       <tbody id="graphicRenderer_button" style="display:none;">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.whenOnLabel"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.whenOnLabel"/></td>
           <td class="formField"><input id="graphicRendererButtonWhenOnLabel" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.whenOffLabel"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.whenOffLabel"/></td>
           <td class="formField"><input id="graphicRendererButtonWhenOffLabel" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.height"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.height"/></td>
           <td class="formField"><input id="graphicRendererButtonHeight" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.width"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.width"/></td>
           <td class="formField"><input id="graphicRendererButtonWidth" type="text"/></td>
         </tr>
         
@@ -406,9 +406,9 @@
                 var html = "\
                     <table>\
                       <tr>\
-                        <th><fmt:message key="viewEdit.graphic.image"/></th>\
-                        <th><fmt:message key="viewEdit.graphic.stateList"/></th>\
-                        <th><fmt:message key="viewEdit.graphic.default"/></th>\
+                        <th><spring:message code="viewEdit.graphic.image"/></th>\
+                        <th><spring:message code="viewEdit.graphic.stateList"/></th>\
+                        <th><spring:message code="viewEdit.graphic.default"/></th>\
                       </tr>";
 
                 for (var i=0; i<imageSet.imageFilenames.length; i++) {
diff --git a/WebContent/WEB-INF/jsp/include/highlight.jsp b/WebContent/WEB-INF/jsp/include/highlight.jsp
index 2606160d24..41ad467f82 100644
--- a/WebContent/WEB-INF/jsp/include/highlight.jsp
+++ b/WebContent/WEB-INF/jsp/include/highlight.jsp
@@ -13,6 +13,12 @@ function updateCodeText(text, destination) {
     hljs.highlightElement(result_element);
 }
 
+function updateCodeTextEscaped(text, destination) {
+    let result_element = document.querySelector(destination);
+    result_element.innerHTML = text;
+    hljs.highlightElement(result_element);
+}
+
 function syncCodeScroll(element, destination) {
   let result_element = document.querySelector(destination);
   result_element.scrollTop = element.scrollTop;
diff --git a/WebContent/WEB-INF/jsp/include/settingsEditor.jsp b/WebContent/WEB-INF/jsp/include/settingsEditor.jsp
index 768cb5bf28..84ad9df6d4 100644
--- a/WebContent/WEB-INF/jsp/include/settingsEditor.jsp
+++ b/WebContent/WEB-INF/jsp/include/settingsEditor.jsp
@@ -36,31 +36,31 @@
     </table>
     <table>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="viewEdit.settings.point"/></td>
+        <td class="formLabelRequired"><spring:message code="viewEdit.settings.point"/></td>
         <td class="formField"><select id="settingsPointList" onchange="settingsEditor.pointSelectChanged()"></select></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="viewEdit.settings.nameOverride"/></td>
+        <td class="formLabel"><spring:message code="viewEdit.settings.nameOverride"/></td>
         <td class="formField"><input id="settingsPointName" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="viewEdit.settings.settableOverride"/></td>
+        <td class="formLabel"><spring:message code="viewEdit.settings.settableOverride"/></td>
         <td class="formField"><input id="settingsSettable" type="checkbox"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="viewEdit.settings.background"/></td>
+        <td class="formLabel"><spring:message code="viewEdit.settings.background"/></td>
         <td class="formField"><input id="settingsBkgdColor" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="viewEdit.settings.displayControls"/></td>
+        <td class="formLabel"><spring:message code="viewEdit.settings.displayControls"/></td>
         <td class="formField"><input id="settingsControls" type="checkbox"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="viewEdit.position.x"/></td>
+        <td class="formLabel"><spring:message code="viewEdit.position.x"/></td>
         <td class="formField"><input id="settingsPositionX" type="number"/></td></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="viewEdit.position.y"/></td>
+        <td class="formLabel"><spring:message code="viewEdit.position.y"/></td>
         <td class="formField"><input id="settingsPositionY" type="number"/></td></td>
       </tr>
     </table>
diff --git a/WebContent/WEB-INF/jsp/include/staticEditor.jsp b/WebContent/WEB-INF/jsp/include/staticEditor.jsp
index a1c8853972..65e2797840 100644
--- a/WebContent/WEB-INF/jsp/include/staticEditor.jsp
+++ b/WebContent/WEB-INF/jsp/include/staticEditor.jsp
@@ -33,11 +33,11 @@
     </table>
     <table>
       <tr>
-        <td class="formLabel"><fmt:message key="viewEdit.position.x"/></td>
+        <td class="formLabel"><spring:message code="viewEdit.position.x"/></td>
         <td class="formField"><input id="staticPositionX" type="number" default="0" min="0"/></td></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="viewEdit.position.y"/></td>
+        <td class="formLabel"><spring:message code="viewEdit.position.y"/></td>
         <td class="formField"><input id="staticPositionY" type="number" default="0" min="0"/></td></td>
       </tr>
     </table>
@@ -48,63 +48,63 @@
     </table>
     <table id="linkEditor">
       <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.text"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.text"/></td>
           <td class="formField"><input id="linkText" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.link"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.link"/></td>
           <td class="formField"><input id="linkLink" type="text"/></td>
         </tr>
         <tr>
-        <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.views"/></td>
+        <td class="formLabelRequired"><spring:message code="viewEdit.graphic.views"/></td>
         <td class="formField"><select id="viewsList" onchange="staticEditor.viewSelectChanged(this.value)"></select></td>
       </tr>
     </table>
     <table id="scriptButtonEditor">
       	<tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.text"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.text"/></td>
           <td class="formField"><input id="scriptButtonText" type="text"/></td>
         </tr>
         <tr>
-        	<td class="formLabelRequired"><fmt:message key="eventHandlers.type.script"/></td>
+        	<td class="formLabelRequired"><spring:message code="eventHandlers.type.script"/></td>
         	<td class="formField"><select id="scriptsList"></select></td>
       	</tr>
     </table>
 
     <table id="chartComparatorEditor">
       	<tr>
-          <td class="formLabelRequired"><fmt:message key="graphic.chartWidth"/></td>
+          <td class="formLabelRequired"><spring:message code="graphic.chartWidth"/></td>
           <td class="formField"><input id="chartComparatorWidth" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="graphic.chartHeight"/></td>
+          <td class="formLabelRequired"><spring:message code="graphic.chartHeight"/></td>
           <td class="formField"><input id="chartComparatorHeight" type="text"/></td>
         </tr>
     </table>
 
      <table id="flexEditor">
       	<tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.width"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.width"/></td>
           <td class="formField"><input id="flexWidth" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.height"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.height"/></td>
           <td class="formField"><input id="flexHeight" type="text"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.projectDefined"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.projectDefined"/></td>
           <td class="formField"><input id="flexProjectDefined" type="checkbox"/></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.projectsSource"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.projectsSource"/></td>
           <td class="formField"><input  id="flexProjectsSource" type="text"/></td>
         </tr>
 		<tr>
-        	<td class="formLabelRequired"><fmt:message key="viewEdit.graphic.project"/></td>
+        	<td class="formLabelRequired"><spring:message code="viewEdit.graphic.project"/></td>
         	<td class="formField"><select id="flexProjectsList"></select></td>
       	</tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="viewEdit.graphic.runtimeMode"/></td>
+          <td class="formLabelRequired"><spring:message code="viewEdit.graphic.runtimeMode"/></td>
           <td class="formField"><input id="flexRuntimeMode" type="checkbox"/></td>
         </tr>
     </table>
@@ -222,7 +222,7 @@
                 posX, posY, viewId,
                 function() {
 	                staticEditor.close();
-	                updateHtmlComponentContent("c"+ staticEditor.componentId, $get("staticPointContent"));
+	                updateHtmlComponentContent("c"+ staticEditor.componentId, escapeHtml($get("staticPointContent")));
 	              }
               );
               break;
@@ -235,7 +235,7 @@
 			        	    showDwrMessages(response.messages);
 					        else {
 						        staticEditor.close();
-		                tempContent = "<a> " +$get("linkText") +"</a>";
+		                tempContent = "<a> " + escapeHtml($get("linkText")) +"</a>";
 		                updateHtmlComponentContent("c"+ staticEditor.componentId, tempContent);
 					        }
 	              }
@@ -250,7 +250,7 @@
 			        	    showDwrMessages(response.messages);
 					        else {
 						        staticEditor.close();
-		                tempContent = "<button> " +$get("scriptButtonText") +"</button>";
+		                tempContent = "<button> " +escapeHtml($get("scriptButtonText")) +"</button>";
 		                updateHtmlComponentContent("c"+ staticEditor.componentId, tempContent);
 					        }
 	            });
@@ -265,7 +265,7 @@
 						      else {
 							      staticEditor.close();
 			              tempContent =
-				              "<div style='background-color: silver; border: 1px solid red; width: "+ ($get("chartComparatorWidth")*2) +"px; height: "+$get("chartComparatorHeight") +"px;'> <b> <fmt:message key='viewEdit.graphic.saveToLoad'/> </b> </div>";
+				              "<div style='background-color: silver; border: 1px solid red; width: "+ ($get("chartComparatorWidth")*2) +"px; height: "+$get("chartComparatorHeight") +"px;'> <b> <spring:message code='viewEdit.graphic.saveToLoad'/> </b> </div>";
 			              componentId = "c"+ staticEditor.componentId;
 			              updateHtmlComponentContent(componentId, tempContent);
 			                //$(componentId).style.top=  "0px";
@@ -288,7 +288,7 @@
 						      else {
 							      staticEditor.close();
 			              tempContent =
-				              "<div style='background-color: silver; border: 1px solid red; width: "+ $get("flexWidth") +"px; height: "+$get("flexHeight") +"px;'> <b> <fmt:message key='viewEdit.graphic.saveToLoad'/> </b> </div>";
+				              "<div style='background-color: silver; border: 1px solid red; width: "+ $get("flexWidth") +"px; height: "+$get("flexHeight") +"px;'> <b> <spring:message code='viewEdit.graphic.saveToLoad'/> </b> </div>";
 			              componentId = "c"+ staticEditor.componentId;
 			              updateHtmlComponentContent(componentId, tempContent);
 			                //$(componentId).style.top=  "0px";
diff --git a/WebContent/WEB-INF/jsp/include/userComment.jsp b/WebContent/WEB-INF/jsp/include/userComment.jsp
index 6d215727ec..49b3695655 100644
--- a/WebContent/WEB-INF/jsp/include/userComment.jsp
+++ b/WebContent/WEB-INF/jsp/include/userComment.jsp
@@ -45,7 +45,7 @@
   
   function saveCommentCB(comment) {
       if (!comment)
-          alert("<fmt:message key="notes.enterComment"/>");
+          alert("<spring:message code="notes.enterComment"/>");
       else {
           closeCommentDialog();
           
@@ -58,7 +58,7 @@
           else if (commentTypeId == <%= UserComment.TYPE_POINT %>)
               commentsNode = $("pointComments"+ commentReferenceId);
           commentsNode.appendChild(content);
-          $("comment"+ comment.ts +"UserTime").textContent = comment.prettyTime + ' <fmt:message key="notes.by"/> ' + comment.username;
+          $("comment"+ comment.ts +"UserTime").textContent = comment.prettyTime + ' <spring:message code="notes.by"/> ' + comment.username;
           $("comment"+ comment.ts +"Text").textContent = comment.comment;
       }
   }
@@ -83,15 +83,15 @@
 </style>
 
 <div dojoType="dialog" id="CommentDialog" bgColor="white" bgOpacity="0.5" toggle="fade" toggleDuration="250">
-  <span class="smallTitle"><fmt:message key="notes.addNote"/></span>
+  <span class="smallTitle"><spring:message code="notes.addNote"/></span>
   <table>
     <tr>
       <td><textarea rows="8" cols="50" id="commentText"></textarea></td>
     </tr>
     <tr>
       <td align="center">
-        <input type="button" value="<fmt:message key="notes.save"/>" onclick="saveComment();"/>
-        <input type="button" value="<fmt:message key="notes.cancel"/>" onclick="closeCommentDialog();"/>
+        <input type="button" value="<spring:message code="notes.save"/>" onclick="saveComment();"/>
+        <input type="button" value="<spring:message code="notes.cancel"/>" onclick="closeCommentDialog();"/>
       </td>
     </tr>
   </table>
@@ -101,7 +101,7 @@
   <tr id="comment_TEMPLATE_">
     <td valign="top" width="16"><tag:img png="comment" title="notes.note"/></td>
     <td valign="top">
-      <span id="comment_TEMPLATE_UserTime" class="copyTitle"><fmt:message key="notes.timeByUsername"/></span><br/>
+      <span id="comment_TEMPLATE_UserTime" class="copyTitle"><spring:message code="notes.timeByUsername"/></span><br/>
       <span id="comment_TEMPLATE_Text"></span>
     </td>
   </tr>
diff --git a/WebContent/WEB-INF/jsp/login.jsp b/WebContent/WEB-INF/jsp/login.jsp
index 23a38ab8d4..3cf61d7d4a 100644
--- a/WebContent/WEB-INF/jsp/login.jsp
+++ b/WebContent/WEB-INF/jsp/login.jsp
@@ -25,7 +25,7 @@
         $("username").focus();
         BrowserDetect.init();
         
-        $set("browser", BrowserDetect.browser +" "+ BrowserDetect.version +" <fmt:message key="login.browserOnPlatform"/> "+ BrowserDetect.OS);
+        $set("browser", BrowserDetect.browser +" "+ BrowserDetect.version +" <spring:message code="login.browserOnPlatform"/> "+ BrowserDetect.OS);
         
         if (checkCombo(BrowserDetect.browser, BrowserDetect.version, BrowserDetect.OS)) {
             $("browserImg").src = "images/accept.png";
@@ -40,31 +40,31 @@
     
     function nag() {
         if (!compatible)
-            alert('<fmt:message key="login.nag"/>');
+            alert('<spring:message code="login.nag"/>');
     }
   </script>
 
   <div class="login-container">
 
     <div class="login-browser">
-      <span id="browser"><fmt:message key="login.unknownBrowser"/></span>
+      <span id="browser"><spring:message code="login.unknownBrowser"/></span>
       <img id="browserImg" src="images/magnifier.png" style="height: 10px;width: auto;"/>
-      <span id="okMsg" style="display:none"><fmt:message key="login.supportedBrowser"/></span>
-      <span id="warnMsg" style="display:none"><fmt:message key="login.unsupportedBrowser"/></span>
+      <span id="okMsg" style="display:none"><spring:message code="login.supportedBrowser"/></span>
+      <span id="warnMsg" style="display:none"><spring:message code="login.unsupportedBrowser"/></span>
     </div>
 
     <div class="login-box">
       <form name="f" action="login.htm" method="post" onclick="nag()">
 
         <div class="form-box">
-          <div class="formLabelRequired"><fmt:message key="login.userId"/></div>
+          <div class="formLabelRequired"><spring:message code="login.userId"/></div>
           <div class="formField">
             <input id="username" type="text" name="username" value="${login.username}" maxlength="40"/>
           </div>
         </div>
 
         <div class="form-box">
-          <div class="formLabelRequired"><fmt:message key="login.password"/></div>
+          <div class="formLabelRequired"><spring:message code="login.password"/></div>
           <div class="formField">
             <input id="password" type="password" name="password" value="${login.password}" maxlength="20"/>
           </div>
@@ -80,7 +80,7 @@
 
 
         <div class="login-button" align="center">
-          <input type="submit" value="<fmt:message key="login.loginButton"/>"/>
+          <input type="submit" value="<spring:message code="login.loginButton"/>"/>
           <tag:help id="welcomeToMango"/>
         </div>
 
diff --git a/WebContent/WEB-INF/jsp/mailingLists.jsp b/WebContent/WEB-INF/jsp/mailingLists.jsp
index d2094267eb..43a52be8c6 100644
--- a/WebContent/WEB-INF/jsp/mailingLists.jsp
+++ b/WebContent/WEB-INF/jsp/mailingLists.jsp
@@ -117,11 +117,11 @@
                     editingMailingList.id = response.data.mlId;
                     appendMailingList(editingMailingList.id);
                     startImageFader("ml"+ editingMailingList.id +"Img");
-                    setUserMessage("<fmt:message key="mailingLists.added"/>");
+                    setUserMessage("<spring:message code="mailingLists.added"/>");
                     show("deleteMailingListImg");
                 }
                 else
-                    setUserMessage("<fmt:message key="mailingLists.saved"/>");
+                    setUserMessage("<spring:message code="mailingLists.saved"/>");
                 MailingListsDwr.getMailingList(editingMailingList.id, updateMailingList)
             }
         });
@@ -133,7 +133,7 @@
             if (response.hasMessages)
                 setUserMessage(response.messages[0].genericMessage);
             else
-                setUserMessage("<fmt:message key="mailingLists.testEmailMessage"/>");
+                setUserMessage("<spring:message code="mailingLists.testEmailMessage"/>");
         });
         startImageFader("sendTestEmailImg");
     }
@@ -178,7 +178,7 @@
         }
 
         if (user == null)
-            alert("<fmt:message key="mailingLists.noUser"/>");
+            alert("<spring:message code="mailingLists.noUser"/>");
         else {
             var userEntry = {
                 recipientType : <c:out value="<%= EmailRecipient.TYPE_USER %>"/>,
@@ -217,7 +217,7 @@
     function createAddressEntry() {
         var addr = $get("address");
         if (addr == "") {
-            alert("<fmt:message key="mailingLists.noAddress"/>");
+            alert("<spring:message code="mailingLists.noAddress"/>");
             return;
         }
         var addressEntry = {
@@ -448,7 +448,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="mailingLists.mailingLists"/></span>
+                <span class="smallTitle"><spring:message code="mailingLists.mailingLists"/></span>
                 <tag:help id="mailingLists"/>
               </td>
               <td align="right"><tag:img png="book_add" title="common.add" onclick="showMailingList(${NEW_ID})"
@@ -468,7 +468,7 @@
         <div class="borderDiv">
           <table width="100%">
             <tr>
-              <td><span class="smallTitle"><fmt:message key="mailingLists.details"/></span></td>
+              <td><span class="smallTitle"><spring:message code="mailingLists.details"/></span></td>
               <td align="right">
                 <tag:img png="save" onclick="saveMailingList();" title="common.save"/>
                 <tag:img id="deleteMailingListImg" png="delete" onclick="deleteMailingList();" title="common.delete"/>
@@ -481,45 +481,45 @@
 
           <table width="100%">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField"><input type="text" id="xid"/></td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="mailingLists.name"/></td>
+              <td class="formLabelRequired"><spring:message code="mailingLists.name"/></td>
               <td class="formField"><input id="name" type="text" onmousedown="this.focus()"/></td>
             </tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="mailingLists.collectInactiveEmails"/><tag:help id="collectInactiveMsg"/></td>
+              <td class="formLabelRequired"><spring:message code="mailingLists.collectInactiveEmails"/><tag:help id="collectInactiveMsg"/></td>
               <td class="formField"><input id="collectInactiveEmails" type="checkbox" onmousedown="this.focus()" onclick="collectInactiveEmails(false)"/></td>
             </tr>
 
             <tr id="cronPatternTr" style="display: none;">
-              <td class="formLabelRequired"><fmt:message key="mailingLists.cronPattern"/><tag:help id="cronPatterns"/></td>
+              <td class="formLabelRequired"><spring:message code="mailingLists.cronPattern"/><tag:help id="cronPatterns"/></td>
               <td class="formField"><input id="cronPattern" type="text" onmousedown="this.focus()"/></td>
             </tr>
 
             <tr id="dailyLimitSentEmailsTr" style="display: none;">
-              <td class="formLabelRequired"><fmt:message key="mailingLists.dailyLimitSentEmails"/></td>
+              <td class="formLabelRequired"><spring:message code="mailingLists.dailyLimitSentEmails"/></td>
               <td class="formField"><input id="dailyLimitSentEmails" type="checkbox" onmousedown="this.focus()" onclick="dailyLimitSentEmails(true)"/></td>
             </tr>
 
             <tr id="dailyLimitSentEmailsNumberTr" style="display: none;">
-              <td class="formLabelRequired"><fmt:message key="mailingLists.dailyLimitSentEmailsNumber"/></td>
+              <td class="formLabelRequired"><spring:message code="mailingLists.dailyLimitSentEmailsNumber"/></td>
               <td class="formField"><input id="dailyLimitSentEmailsNumber" type="text" onmousedown="this.focus()"/></td>
             </tr>
 
             <tr><td class="horzSeparator" colspan="2"></td></tr>
             <tr>
-              <td class="formLabel"><fmt:message key="mailingLists.addUser"/></td>
+              <td class="formLabel"><spring:message code="mailingLists.addUser"/></td>
               <td class="formField">
                 <select id="userList"></select>
                 <tag:img png="add" title="common.add" onclick="createUserEntry()"/>
               </td>
             </tr>
             <tr>
-              <td class="formLabel"><fmt:message key="mailingLists.addAddress"/></td>
+              <td class="formLabel"><spring:message code="mailingLists.addAddress"/></td>
               <td class="formField">
                 <input id="address" type="text" class="formLong" onmousedown="this.focus()"/>
                 <tag:img png="add" title="common.add" onclick="createAddressEntry()"/>
@@ -528,9 +528,9 @@
           </table>
           
           <table width="100%">
-            <tr><td colspan="3" class="smallTitle"><fmt:message key="mailingLists.entries"/></td></tr>
+            <tr><td colspan="3" class="smallTitle"><spring:message code="mailingLists.entries"/></td></tr>
             <tr id="emptyEntryListMessage">
-              <td colspan="3"><fmt:message key="mailingLists.noEntries"/></td>
+              <td colspan="3"><spring:message code="mailingLists.noEntries"/></td>
             </tr>
             <tr id="mleUser_TEMPLATE_" style="display:none;">
               <td width="16"><img id="mle_TEMPLATE_Img" src="images/hourglass.png"/></td>
@@ -553,24 +553,24 @@
           <table>
             <tr><td colspan="5" class="horzSeparator" colspan="2"></td></tr>
             <tr>
-              <td class="smallTitle"><fmt:message key="common.activeTime"/></td>
+              <td class="smallTitle"><spring:message code="common.activeTime"/></td>
               <td class="qreg qon"></td>
-              <td><fmt:message key="common.active"/></td>
+              <td><spring:message code="common.active"/></td>
               <td class="qreg qoff"></td>
-              <td><fmt:message key="common.inactive"/></td>
+              <td><spring:message code="common.inactive"/></td>
             </tr>
             <tr>
               <td style="padding:5px;" colspan="5" >
                 <table cellspacing="0" cellpadding="0">
                   <tr>
                     <td></td>
-                    <th><fmt:message key="common.day.short.mon"/></th>
-                    <th><fmt:message key="common.day.short.tue"/></th>
-                    <th><fmt:message key="common.day.short.wed"/></th>
-                    <th><fmt:message key="common.day.short.thu"/></th>
-                    <th><fmt:message key="common.day.short.fri"/></th>
-                    <th><fmt:message key="common.day.short.sat"/></th>
-                    <th><fmt:message key="common.day.short.sun"/></th>
+                    <th><spring:message code="common.day.short.mon"/></th>
+                    <th><spring:message code="common.day.short.tue"/></th>
+                    <th><spring:message code="common.day.short.wed"/></th>
+                    <th><spring:message code="common.day.short.thu"/></th>
+                    <th><spring:message code="common.day.short.fri"/></th>
+                    <th><spring:message code="common.day.short.sat"/></th>
+                    <th><spring:message code="common.day.short.sun"/></th>
                   </tr>
                   <tbody id="scheduleRows"></tbody>
                 </table>
diff --git a/WebContent/WEB-INF/jsp/maintenanceEvents.jsp b/WebContent/WEB-INF/jsp/maintenanceEvents.jsp
index b6aa29b9eb..2a99708b8c 100644
--- a/WebContent/WEB-INF/jsp/maintenanceEvents.jsp
+++ b/WebContent/WEB-INF/jsp/maintenanceEvents.jsp
@@ -35,19 +35,19 @@
     }
     
     function init() {
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.mon"/>", <c:out value="<%= DateTimeConstants.MONDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.tue"/>", <c:out value="<%= DateTimeConstants.TUESDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.wed"/>", <c:out value="<%= DateTimeConstants.WEDNESDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.thu"/>", <c:out value="<%= DateTimeConstants.THURSDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.fri"/>", <c:out value="<%= DateTimeConstants.FRIDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.sat"/>", <c:out value="<%= DateTimeConstants.SATURDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.sun"/>", <c:out value="<%= DateTimeConstants.SUNDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.mon"/>", <c:out value="<%= DateTimeConstants.MONDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.tue"/>", <c:out value="<%= DateTimeConstants.TUESDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.wed"/>", <c:out value="<%= DateTimeConstants.WEDNESDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.thu"/>", <c:out value="<%= DateTimeConstants.THURSDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.fri"/>", <c:out value="<%= DateTimeConstants.FRIDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.sat"/>", <c:out value="<%= DateTimeConstants.SATURDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.sun"/>", <c:out value="<%= DateTimeConstants.SUNDAY %>"/>);
         
         for (var i=1; i<29; i++)
             monthdays[monthdays.length] = new OptionData(i, i);
-        monthdays[monthdays.length] = new OptionData("<fmt:message key="common.day.thirdLast"/>", -3);
-        monthdays[monthdays.length] = new OptionData("<fmt:message key="common.day.secondLast"/>", -2);
-        monthdays[monthdays.length] = new OptionData("<fmt:message key="common.day.last"/>", -1);
+        monthdays[monthdays.length] = new OptionData("<spring:message code="common.day.thirdLast"/>", -3);
+        monthdays[monthdays.length] = new OptionData("<spring:message code="common.day.secondLast"/>", -2);
+        monthdays[monthdays.length] = new OptionData("<spring:message code="common.day.last"/>", -1);
         
         for (var i=1; i<32; i++)
             oncedays[oncedays.length] = new OptionData(i, i);
@@ -128,11 +128,11 @@
                             editingMaintenanceEvent.id = response.data.meId;
                             appendMaintenanceEvent(editingMaintenanceEvent.id);
                             startImageFader($("me"+ editingMaintenanceEvent.id +"Img"));
-                            setUserMessage("<fmt:message key="maintenanceEvents.meAdded"/>");
+                            setUserMessage("<spring:message code="maintenanceEvents.meAdded"/>");
                             show($("deleteMaintenanceEventImg"));
                         }
                         else
-                            setUserMessage("<fmt:message key="maintenanceEvents.meSaved"/>");
+                            setUserMessage("<spring:message code="maintenanceEvents.meSaved"/>");
                         MaintenanceEventsDwr.getMaintenanceEvent(editingMaintenanceEvent.id, function(response) {
                             updateToggle(response.data.activated);
                         	updateMaintenanceEvent(response.data.me);
@@ -342,7 +342,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="maintenanceEvents.mes"/></span>
+                <span class="smallTitle"><spring:message code="maintenanceEvents.mes"/></span>
                 <tag:help id="maintenanceEvents"/>
               </td>
               <td align="right"><tag:img png="add" title="maintenanceEvents.addMe"
@@ -364,7 +364,7 @@
         <div class="borderDiv">
           <table width="100%">
             <tr>
-              <td><span class="smallTitle"><fmt:message key="maintenanceEvents.meDetails"/></span></td>
+              <td><span class="smallTitle"><spring:message code="maintenanceEvents.meDetails"/></span></td>
               <td align="right">
                 <tag:img png="save" onclick="saveMaintenanceEvent();" title="common.save"/>
                 <tag:img id="deleteMaintenanceEventImg" png="delete" onclick="deleteMaintenanceEvent();" title="common.delete"/>
@@ -375,22 +375,22 @@
           
           <table>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField"><input type="text" id="xid"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="maintenanceEvents.dataSource"/></td>
+              <td class="formLabelRequired"><spring:message code="maintenanceEvents.dataSource"/></td>
               <td class="formField"><select id="dataSourceId"></select></td>
             </tr>
             
             <tr>
-              <td class="formLabel"><fmt:message key="maintenanceEvents.alias"/></td>
+              <td class="formLabel"><spring:message code="maintenanceEvents.alias"/></td>
               <td class="formField"><input type="text" id="alias"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+              <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
               <td class="formField">
                 <select id="alarmLevel" onchange="updateAlarmLevelImage()">
                   <tag:alarmLevelOptions/>
@@ -400,31 +400,31 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="maintenanceEvents.type"/></td>
+              <td class="formLabelRequired"><spring:message code="maintenanceEvents.type"/></td>
               <td class="formField">
                 <select id="scheduleType" onchange="refreshDateTimeFields()">
-                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_MANUAL %>"/>"><fmt:message key="maintenanceEvents.type.manual"/></option>
-                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_HOURLY %>"/>"><fmt:message key="maintenanceEvents.type.hour"/></option>
-                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_DAILY %>"/>"><fmt:message key="maintenanceEvents.type.day"/></option>
-                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_WEEKLY %>"/>"><fmt:message key="maintenanceEvents.type.week"/></option>
-                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_MONTHLY %>"/>"><fmt:message key="maintenanceEvents.type.month"/></option>
-                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_YEARLY %>"/>"><fmt:message key="maintenanceEvents.type.year"/></option>
-                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_ONCE %>"/>"><fmt:message key="maintenanceEvents.type.once"/></option>
-                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_CRON %>"/>"><fmt:message key="maintenanceEvents.type.cron"/></option>
+                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_MANUAL %>"/>"><spring:message code="maintenanceEvents.type.manual"/></option>
+                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_HOURLY %>"/>"><spring:message code="maintenanceEvents.type.hour"/></option>
+                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_DAILY %>"/>"><spring:message code="maintenanceEvents.type.day"/></option>
+                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_WEEKLY %>"/>"><spring:message code="maintenanceEvents.type.week"/></option>
+                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_MONTHLY %>"/>"><spring:message code="maintenanceEvents.type.month"/></option>
+                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_YEARLY %>"/>"><spring:message code="maintenanceEvents.type.year"/></option>
+                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_ONCE %>"/>"><spring:message code="maintenanceEvents.type.once"/></option>
+                  <option value="<c:out value="<%= MaintenanceEventVO.TYPE_CRON %>"/>"><spring:message code="maintenanceEvents.type.cron"/></option>
                 </select>
               </td>
             </tr>
             
             <tr id="activeDateTimeRow">
-              <td class="formLabelRequired"><fmt:message key="common.activeTime"/></td>
+              <td class="formLabelRequired"><spring:message code="common.activeTime"/></td>
               <td>
                 <table id="activeDateTable">
                   <tr>
-                    <td align="center" id="activeYearLabel"><fmt:message key="common.tp.year"/></td>
+                    <td align="center" id="activeYearLabel"><spring:message code="common.tp.year"/></td>
                     <td id="activeYearSpacer"></td>
-                    <td align="center" id="activeMonthLabel"><fmt:message key="common.tp.month"/></td>
+                    <td align="center" id="activeMonthLabel"><spring:message code="common.tp.month"/></td>
                     <td id="activeMonthSpacer"></td>
-                    <td align="center"><fmt:message key="common.tp.day"/></td>
+                    <td align="center"><spring:message code="common.tp.day"/></td>
                   </tr>
                   
                   <tr>
@@ -441,11 +441,11 @@
                 </table>
                 <table id="activeTimeTable">
                   <tr>
-                    <td align="center" id="activeHourLabel"><fmt:message key="common.tp.hour"/></td>
+                    <td align="center" id="activeHourLabel"><spring:message code="common.tp.hour"/></td>
                     <td id="activeHourSpacer"></td>
-                    <td align="center"><fmt:message key="common.tp.minute"/></td>
+                    <td align="center"><spring:message code="common.tp.minute"/></td>
                     <td></td>
-                    <td align="center"><fmt:message key="common.tp.second"/></td>
+                    <td align="center"><spring:message code="common.tp.second"/></td>
                   </tr>
                   <tr>
                     <td id="activeHourData">
@@ -474,22 +474,22 @@
                   </tr>
                 </table>
                 <table id="activeCronTable">
-                  <tr><td align="center"><fmt:message key="common.cronPattern"/></td></tr>
+                  <tr><td align="center"><spring:message code="common.cronPattern"/></td></tr>
                   <tr><td><input type="text" id="activeCron"/> <tag:help id="cronPatterns"/></td></tr>
                 </table>
               </td>
             </tr>
             
             <tr id="inactiveDateTimeRow">
-              <td class="formLabelRequired"><fmt:message key="common.inactiveTime"/></td>
+              <td class="formLabelRequired"><spring:message code="common.inactiveTime"/></td>
               <td>
                 <table id="inactiveDateTable">
                   <tr>
-                    <td align="center" id="inactiveYearLabel"><fmt:message key="common.tp.year"/></td>
+                    <td align="center" id="inactiveYearLabel"><spring:message code="common.tp.year"/></td>
                     <td id="inactiveYearSpacer"></td>
-                    <td align="center" id="inactiveMonthLabel"><fmt:message key="common.tp.month"/></td>
+                    <td align="center" id="inactiveMonthLabel"><spring:message code="common.tp.month"/></td>
                     <td id="inactiveMonthSpacer"></td>
-                    <td align="center"><fmt:message key="common.tp.day"/></td>
+                    <td align="center"><spring:message code="common.tp.day"/></td>
                   </tr>
                   <tr>
                     <td id="inactiveYearData"><input id="inactiveYear" type="text" class="formVeryShort"/></td>
@@ -505,11 +505,11 @@
                 </table>
                 <table id="inactiveTimeTable">
                   <tr>
-                    <td align="center" id="inactiveHourLabel"><fmt:message key="common.tp.hour"/></td>
+                    <td align="center" id="inactiveHourLabel"><spring:message code="common.tp.hour"/></td>
                     <td id="inactiveHourSpacer"></td>
-                    <td align="center"><fmt:message key="common.tp.minute"/></td>
+                    <td align="center"><spring:message code="common.tp.minute"/></td>
                     <td></td>
-                    <td align="center"><fmt:message key="common.tp.second"/></td>
+                    <td align="center"><spring:message code="common.tp.second"/></td>
                   </tr>
                   <tr>
                     <td id="inactiveHourData">
@@ -538,14 +538,14 @@
                   </tr>
                 </table>
                 <table id="inactiveCronTable">
-                  <tr><td align="center"><fmt:message key="common.cronPattern"/></td></tr>
+                  <tr><td align="center"><spring:message code="common.cronPattern"/></td></tr>
                   <tr><td><input type="text" id="inactiveCron"/> <tag:help id="cronPatterns"/></td></tr>
                 </table>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.disabled"/></td>
+              <td class="formLabelRequired"><spring:message code="common.disabled"/></td>
               <td class="formField"><input type="checkbox" id="disabled"/></td>
             </tr>
           </table>
diff --git a/WebContent/WEB-INF/jsp/mobile/login.jsp b/WebContent/WEB-INF/jsp/mobile/login.jsp
index c4dfbe2d9e..a527e848c5 100644
--- a/WebContent/WEB-INF/jsp/mobile/login.jsp
+++ b/WebContent/WEB-INF/jsp/mobile/login.jsp
@@ -22,7 +22,7 @@
     <table>
       <spring:bind path="login.username">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="login.userId"/></td>
+          <td class="formLabelRequired"><spring:message code="login.userId"/></td>
           <td class="formField">
             <input id="username" type="text" name="username" value="${status.value}" maxlength="40"/>
           </td>
@@ -32,7 +32,7 @@
       
       <spring:bind path="login.password">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="login.password"/></td>
+          <td class="formLabelRequired"><spring:message code="login.password"/></td>
           <td class="formField">
             <input id="password" type="password" name="password" value="${status.value}" maxlength="20"/>
           </td>
@@ -53,7 +53,7 @@
       
       <tr>
         <td colspan="2" align="center">
-          <input type="submit" value="<fmt:message key="login.loginButton"/>"/>
+          <input type="submit" value="<spring:message code="login.loginButton"/>"/>
         </td>
         <td></td>
       </tr>
diff --git a/WebContent/WEB-INF/jsp/mobile/watchList.jsp b/WebContent/WEB-INF/jsp/mobile/watchList.jsp
index a3f2992238..9ac90ae071 100644
--- a/WebContent/WEB-INF/jsp/mobile/watchList.jsp
+++ b/WebContent/WEB-INF/jsp/mobile/watchList.jsp
@@ -24,7 +24,7 @@
         <td>${state.name}</td>
         <c:choose>
           <c:when test="${state.disabled}">
-            <td colspan="2"><fmt:message key="common.pointWarning"/></td>
+            <td colspan="2"><spring:message code="common.pointWarning"/></td>
           </c:when>
           <c:otherwise>
             <td align="center">${state.value}</td>
@@ -35,7 +35,7 @@
     </c:forEach>
   </table>
   
-  <fmt:message key="header.watchlist"/>:
+  <spring:message code="header.watchlist"/>:
   <sst:select id="watchListSelect" value="${selectedWatchList}"
           onchange="window.location='mobile_watch_list.shtm?watchListId='+ this.value">
     <c:forEach items="${watchLists}" var="wl">
@@ -43,7 +43,7 @@
     </c:forEach>
   </sst:select>
 
-  <a href="mobile_watch_list.shtm"><fmt:message key="header.reload"/></a>
+  <a href="mobile_watch_list.shtm"><spring:message code="header.reload"/></a>
   
-  <a href="mobile_logout.htm"><fmt:message key="header.logout"/></a>
+  <a href="mobile_logout.htm"><spring:message code="header.logout"/></a>
 </mobileTag:page>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pointEdit/buttons.jsp b/WebContent/WEB-INF/jsp/pointEdit/buttons.jsp
index c2b895b908..2e05124178 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/buttons.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/buttons.jsp
@@ -21,28 +21,28 @@
 <table>
   <tr>
     <td colspan="2" align="center">
-      <input type="submit" value="<fmt:message key="common.save"/>"
+      <input type="submit" value="<spring:message code="common.save"/>"
               onclick="return doSave('<%= DataPointEditController.SUBMIT_SAVE %>');"/>
       <c:choose>
         <c:when test="${form.enabled}">
-          <input type="submit" value="<fmt:message key="pointEdit.buttons.disable"/>"
+          <input type="submit" value="<spring:message code="pointEdit.buttons.disable"/>"
                   onclick="return doSave('<%= DataPointEditController.SUBMIT_DISABLE %>');"/>
-          <input type="submit" value="<fmt:message key="pointEdit.buttons.restart"/>" 
+          <input type="submit" value="<spring:message code="pointEdit.buttons.restart"/>"
                   onclick="return doSave('<%= DataPointEditController.SUBMIT_RESTART %>');"/>
         </c:when>
         <c:otherwise>
-          <input type="submit" value="<fmt:message key="pointEdit.buttons.enable"/>"
+          <input type="submit" value="<spring:message code="pointEdit.buttons.enable"/>"
                   onclick="return doSave('<%= DataPointEditController.SUBMIT_ENABLE %>');"/>
         </c:otherwise>
       </c:choose>
       
-      <input type="button" value="<fmt:message key="common.cancel"/>"
+      <input type="button" value="<spring:message code="common.cancel"/>"
               onclick="window.location='data_source_edit.shtm?dsid=${dataSource.id}&pid=${form.id}';"/>
     </td>
     <td></td>
   </tr>
   
   <tr>
-    <td colspan="2"><fmt:message key="pointEdit.buttons.note"/></td>
+    <td colspan="2"><span class="smallTitle"><spring:message code="pointEdit.buttons.note.prefix"/></span> <spring:message code="pointEdit.buttons.note"/></td>
   </tr>
 </table>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pointEdit/chartRenderer.jsp b/WebContent/WEB-INF/jsp/pointEdit/chartRenderer.jsp
index 2af38bb438..6b00d1be2d 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/chartRenderer.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/chartRenderer.jsp
@@ -20,17 +20,17 @@
 <div class="borderDiv marB marR">
   <table>
     <tr><td colspan="3">
-      <span class="smallTitle"><fmt:message key="pointEdit.chart.props"/></span>
+      <span class="smallTitle"><spring:message code="pointEdit.chart.props"/></span>
       <tag:help id="chartRenderers"/>
     </td></tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="pointEdit.chart.type"/></td>
+      <td class="formLabelRequired"><spring:message code="pointEdit.chart.type"/></td>
       <td class="formField">
         <sst:select id="chartRendererSelect" onchange="chartRendererEditor.change()"
                 value="${form.chartRenderer.typeName}">
           <c:forEach items="${chartRenderers}" var="crdef">
-            <sst:option value="${crdef.name}"><fmt:message key="${crdef.nameKey}"/></sst:option>
+            <sst:option value="${crdef.name}"><spring:message code="${crdef.nameKey}"/></sst:option>
           </c:forEach>
         </sst:select>
       </td>
@@ -39,13 +39,13 @@
     <tbody id="chartRendererNone" style="display:none;"></tbody>
     <tbody id="chartRendererTable" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.chart.limit"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.chart.limit"/></td>
         <td class="formField"><input id="chartRendererTableLimit" type="text" class="formShort"/></td>
       </tr>
     </tbody>
     <tbody id="chartRendererImage" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.chart.timePeriod"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.chart.timePeriod"/></td>
         <td class="formField">
           <input id="chartRendererImageNumberOfPeriods" type="text" class="formVeryShort"/>
           <select id="chartRendererImageTimePeriod">
@@ -56,7 +56,7 @@
     </tbody>
     <tbody id="chartRendererStats" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.chart.timePeriod"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.chart.timePeriod"/></td>
         <td class="formField">
           <input id="chartRendererStatsNumberOfPeriods" type="text" class="formVeryShort"/>
           <select id="chartRendererStatsTimePeriod">
@@ -65,19 +65,19 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.chart.includeSum"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.chart.includeSum"/></td>
         <td class="formField"><input id="chartRendererStatsIncludeSum" type="checkbox"/></td>
       </tr>
     </tbody>
     <tbody id="chartRendererImageFlipbook" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.chart.limit"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.chart.limit"/></td>
         <td class="formField"><input id="chartRendererImageFlipbookLimit" type="text" class="formShort"/></td>
       </tr>
     </tbody>
     
     <tr>
-      <td colspan="2"><fmt:message key="pointEdit.chart.note"/></td>
+      <td colspan="2"><spring:message code="pointEdit.chart.note"/></td>
     </tr>
   </table>
 </div>
@@ -129,18 +129,18 @@
           else if (typeName == "chartRendererTable") {
               var limit = parseInt($get("chartRendererTableLimit"));
               if (isNaN(limit))
-                  alert("<fmt:message key="pointEdit.chart.missingLimit"/>");
+                  alert("<spring:message code="pointEdit.chart.missingLimit"/>");
               else if (limit < 2 || limit > 50)
-                  alert("<fmt:message key="pointEdit.chart.invalidLimit"/>");
+                  alert("<spring:message code="pointEdit.chart.invalidLimit"/>");
               else
                   DataPointEditDwr.setTableChartRenderer(limit, callback);
           }
           else if (typeName == "chartRendererImage") {
               var numberOfPeriods = parseInt($get("chartRendererImageNumberOfPeriods"));
               if (isNaN(numberOfPeriods))
-                  alert("<fmt:message key="pointEdit.chart.missingPeriods"/>");
+                  alert("<spring:message code="pointEdit.chart.missingPeriods"/>");
               else if (numberOfPeriods < 1)
-                  alert("<fmt:message key="pointEdit.chart.invalidPeriods"/>");
+                  alert("<spring:message code="pointEdit.chart.invalidPeriods"/>");
               else
                   DataPointEditDwr.setImageChartRenderer($get("chartRendererImageTimePeriod"),
                           numberOfPeriods, callback);
@@ -148,9 +148,9 @@
           else if (typeName == "chartRendererStats") {
               var numberOfPeriods = parseInt($get("chartRendererStatsNumberOfPeriods"));
               if (isNaN(numberOfPeriods))
-                  alert("<fmt:message key="pointEdit.chart.missingPeriods"/>");
+                  alert("<spring:message code="pointEdit.chart.missingPeriods"/>");
               else if (numberOfPeriods < 1)
-                  alert("<fmt:message key="pointEdit.chart.invalidPeriods"/>");
+                  alert("<spring:message code="pointEdit.chart.invalidPeriods"/>");
               else
                   DataPointEditDwr.setStatisticsChartRenderer($get("chartRendererStatsTimePeriod"), 
                           numberOfPeriods, $get("chartRendererStatsIncludeSum"), callback);
@@ -158,9 +158,9 @@
           else if (typeName == "chartRendererImageFlipbook") {
               var limit = parseInt($get("chartRendererImageFlipbookLimit"));
               if (isNaN(limit))
-                  alert("<fmt:message key="pointEdit.chart.missingLimit"/>");
+                  alert("<spring:message code="pointEdit.chart.missingLimit"/>");
               else if (limit < 2 || limit > 50)
-                  alert("<fmt:message key="pointEdit.chart.invalidLimit"/>");
+                  alert("<spring:message code="pointEdit.chart.invalidLimit"/>");
               else
                   DataPointEditDwr.setImageFlipbookRenderer(limit, callback);
           }
diff --git a/WebContent/WEB-INF/jsp/pointEdit/eventDetectors.jsp b/WebContent/WEB-INF/jsp/pointEdit/eventDetectors.jsp
index f168ac9528..1497a8fa5f 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/eventDetectors.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/eventDetectors.jsp
@@ -21,16 +21,16 @@
 <div class="borderDiv">
   <table id="eventDetectorTable">
     <tr><td colspan="2">
-      <span class="smallTitle"><fmt:message key="pointEdit.detectors.eventDetectors"/></span>
+      <span class="smallTitle"><spring:message code="pointEdit.detectors.eventDetectors"/></span>
       <tag:help id="eventDetectors"/>
     </td></tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.type"/></td>
+      <td class="formLabelRequired"><spring:message code="pointEdit.detectors.type"/></td>
       <td class="formField">
         <select id="eventDetectorSelect">
           <c:forEach items="${eventDetectors}" var="eddef">
-            <option value="${eddef.id}"><fmt:message key="${eddef.nameKey}"/></option>
+            <option value="${eddef.id}"><spring:message code="${eddef.nameKey}"/></option>
           </c:forEach>
         </select>
         <tag:img png="bell_add" title="common.add" onclick="pointEventDetectorEditor.addEventDetector();"/>
@@ -39,7 +39,7 @@
     
     <tr><td colspan="2">
       <div id="emptyListMessage" style="color:#888888;padding:10px;text-align:center;">
-        <fmt:message key="pointEdit.detectors.empty"/>
+        <spring:message code="pointEdit.detectors.empty"/>
       </div>
     </td></tr>
   </table>
@@ -50,20 +50,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.highLimitDet"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.highLimitDet"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -73,11 +73,11 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.highLimit"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.highLimit"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Limit" type="text" class="formShort"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -91,20 +91,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.lowLimitDet"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.lowLimitDet"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -114,11 +114,11 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.lowLimit"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.lowLimit"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Limit" type="text" class="formShort"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -132,20 +132,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.stateDet"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.stateDet"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -155,16 +155,16 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.state"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.state"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_State">
-            <option value="false"><fmt:message key="pointEdit.detectors.zero"/></option>
-            <option value="true"><fmt:message key="pointEdit.detectors.one"/></option>
+            <option value="false"><spring:message code="pointEdit.detectors.zero"/></option>
+            <option value="true"><spring:message code="pointEdit.detectors.one"/></option>
           </select>
         </td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -178,20 +178,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.stateDet"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.stateDet"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -201,11 +201,11 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.state"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.state"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_State" type="text" class="formShort"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -219,20 +219,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.changeDet"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.changeDet"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -249,20 +249,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.changeCounter"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.changeCounter"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -272,11 +272,11 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.changeCount"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.changeCount"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_ChangeCount" type="text" class="formShort"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -290,20 +290,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.noChange"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.noChange"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -313,7 +313,7 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -327,20 +327,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.noUpdate"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.noUpdate"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -350,7 +350,7 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -364,20 +364,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.stateDet"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.stateDet"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -387,11 +387,11 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.state"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.state"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_State" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -405,20 +405,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.posCusumDet"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.posCusumDet"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -428,15 +428,15 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.posLimit"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.posLimit"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Limit" type="text" class="formShort"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.weight"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.weight"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Weight" type="text" class="formShort"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -450,20 +450,20 @@
       <tr>
         <td class="formLabelRequired">
           <tag:img png="bell_delete" title="common.delete" onclick="pointEventDetectorEditor.deleteDetector(getPedId(this))"/>
-          <fmt:message key="pointEdit.detectors.type"/>
+          <spring:message code="pointEdit.detectors.type"/>
         </td>
-        <td class="formField"><fmt:message key="pointEdit.detectors.negCusumDet"/></td>
+        <td class="formField"><spring:message code="pointEdit.detectors.negCusumDet"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+        <td class="formLabelRequired"><spring:message code="common.xid"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Xid" type="text" class="formLong" maxlength="50"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.alias"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.alias"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Alias" type="text" class="formLong"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+        <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
         <td class="formField">
           <select id="eventDetector_TEMPLATE_AlarmLevel"
                   onchange="pointEventDetectorEditor.updateAlarmLevelImage(this.value, getPedId(this))">
@@ -473,15 +473,15 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.negLimit"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.negLimit"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Limit" type="text" class="formShort"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.detectors.weight"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.detectors.weight"/></td>
         <td class="formField"><input id="eventDetector_TEMPLATE_Weight" type="text" class="formShort"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.detectors.duration"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.detectors.duration"/></td>
         <td class="formField">
           <input id="eventDetector_TEMPLATE_Duration" type="text" class="formShort"/>
           <select id="eventDetector_TEMPLATE_DurationType"><tag:timePeriodOptions s="true" min="true" h="true"/></select>
@@ -643,11 +643,11 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(limit))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingLimit"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingLimit"/>";
                   else if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 0)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateHighLimitDetector(pedId, xid, alias, limit, duration, durationType,
@@ -660,11 +660,11 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(limit))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingLimit"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingLimit"/>";
                   else if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 0)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateLowLimitDetector(pedId, xid, alias, limit, duration, durationType,
@@ -677,9 +677,9 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 0)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateBinaryStateDetector(pedId, xid, alias, state, duration, durationType,
@@ -692,11 +692,11 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(state))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingState"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingState"/>";
                   else if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 0)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateMultistateStateDetector(pedId, xid, alias, state, duration, durationType,
@@ -713,13 +713,13 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(count))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingChangeCount"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingChangeCount"/>";
                   else if (count < 2)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidChangeCount"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidChangeCount"/>";
                   else if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 1)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateStateChangeCountDetector(pedId, xid, alias, count, duration, durationType, 
@@ -731,9 +731,9 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 1)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateNoChangeDetector(pedId, xid, alias, duration, durationType, alarmLevel,
@@ -745,9 +745,9 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 1)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateNoUpdateDetector(pedId, xid, alias, duration, durationType, alarmLevel,
@@ -760,11 +760,11 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (state && state.length > 128)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidState"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidState"/>";
                   else if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 0)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateAlphanumericStateDetector(pedId, xid, alias, state, duration, durationType, 
@@ -778,13 +778,13 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(limit))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingLimit"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingLimit"/>";
                   else if (isNaN(weight))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingWeight"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingWeight"/>";
                   else if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 0)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updatePositiveCusumDetector(pedId, xid, alias, limit, weight, duration,
@@ -798,13 +798,13 @@
                   var durationType = parseInt($get("eventDetector"+ pedId +"DurationType"));
                   
                   if (isNaN(limit))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingLimit"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingLimit"/>";
                   else if (isNaN(weight))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingWeight"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingWeight"/>";
                   else if (isNaN(duration))
-                      errorMessage = "<fmt:message key="pointEdit.detectors.errorParsingDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.errorParsingDuration"/>";
                   else if (duration < 0)
-                      errorMessage = "<fmt:message key="pointEdit.detectors.invalidDuration"/>";
+                      errorMessage = "<spring:message code="pointEdit.detectors.invalidDuration"/>";
                   else {
                       saveCBCount++;
                       DataPointEditDwr.updateNegativeCusumDetector(pedId, xid, alias, limit, weight, duration,
diff --git a/WebContent/WEB-INF/jsp/pointEdit/eventTextRenderer.jsp b/WebContent/WEB-INF/jsp/pointEdit/eventTextRenderer.jsp
index 6c7b90659a..d50a52dc9c 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/eventTextRenderer.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/eventTextRenderer.jsp
@@ -20,17 +20,17 @@
 <div class="borderDiv marB marR">
   <table>
     <tr><td colspan="3">
-      <span class="smallTitle"><fmt:message key="pointEdit.event.text.props"/></span>
+      <span class="smallTitle"><spring:message code="pointEdit.event.text.props"/></span>
       <tag:help id="eventTextRenderers"/>
     </td></tr>
 
     <tr>
-      <td class="formLabelRequired"><fmt:message key="pointEdit.text.type"/></td>
+      <td class="formLabelRequired"><spring:message code="pointEdit.text.type"/></td>
       <td class="formField">
         <sst:select id="eventTextRendererSelect" onchange="eventTextRendererEditor.change();"
                     value="${form.eventTextRenderer.typeName}">
           <c:forEach items="${eventTextRenderers}" var="etrdef">
-            <sst:option value="${etrdef.name}"><fmt:message key="${etrdef.nameKey}"/></sst:option>
+            <sst:option value="${etrdef.name}"><spring:message code="${etrdef.nameKey}"/></sst:option>
           </c:forEach>
         </sst:select>
       </td>
@@ -38,21 +38,21 @@
 
     <tbody id="eventTextRendererBinary" style="display:none;">
     <tr>
-      <td class="formLabelRequired"><fmt:message key="pointEdit.text.zero"/></td>
+      <td class="formLabelRequired"><spring:message code="pointEdit.text.zero"/></td>
       <td class="formField">
         <table cellspacing="0" cellpadding="0">
           <tr>
-            <td valign="top"><input class="formLong" id="eventTextRendererBinaryZero" type="text"/></td>
+            <td valign="top"><input class="formLong" id="eventTextRendererBinaryZero" type="text" value="<c:catch var="exception"><c:out value="${form.eventTextRenderer.zeroLabel}" /></c:catch>"/></td>
           </tr>
         </table>
       </td>
     </tr>
     <tr>
-      <td class="formLabelRequired"><fmt:message key="pointEdit.text.one"/></td>
+      <td class="formLabelRequired"><spring:message code="pointEdit.text.one"/></td>
       <td class="formField">
         <table cellspacing="0" cellpadding="0">
           <tr>
-            <td valign="top"><input class="formLong" id="eventTextRendererBinaryOne" type="text"/></td>
+            <td valign="top"><input class="formLong" id="eventTextRendererBinaryOne" type="text" value="<c:catch var="exception"><c:out value="${form.eventTextRenderer.oneLabel}" /></c:catch>"/></td>
           </tr>
         </table>
       </td>
@@ -63,8 +63,8 @@
       <td colspan="2">
         <table>
           <tr>
-            <th><fmt:message key="pointEdit.text.key"/></th>
-            <th><fmt:message key="pointEdit.text.text"/></th>
+            <th><spring:message code="pointEdit.text.key"/></th>
+            <th><spring:message code="pointEdit.text.text"/></th>
             <td></td>
           </tr>
           <tr>
@@ -86,9 +86,9 @@
       <td colspan="2">
         <table>
           <tr>
-            <th><fmt:message key="pointEdit.text.from"/></th>
-            <th><fmt:message key="pointEdit.text.to"/></th>
-            <th><fmt:message key="pointEdit.text.text"/></th>
+            <th><spring:message code="pointEdit.text.from"/></th>
+            <th><spring:message code="pointEdit.text.to"/></th>
+            <th><spring:message code="pointEdit.text.text"/></th>
             <td></td>
           </tr>
           <tr>
@@ -119,25 +119,23 @@
 
       // Figure out which fields to populate with data.
       <c:choose>
-      <c:when test='${form.eventTextRenderer.typeName == "eventTextRendererBinary"}'>
-      $set("eventTextRendererBinaryZero", "${form.eventTextRenderer.zeroLabel}");
-      $set("eventTextRendererBinaryOne", "${form.eventTextRenderer.oneLabel}");
-      </c:when>
-      <c:when test='${form.eventTextRenderer.typeName == "eventTextRendererMultistate"}'>
-      <c:forEach items="${form.eventTextRenderer.multistateEventValues}" var="msValue">
-      eventTextRendererEditor.addMultistateEventValue("${msValue.key}", "${msValue.text}");
-      </c:forEach>
-      </c:when>
-      <c:when test='${form.eventTextRenderer.typeName == "eventTextRendererNone"}'>
-      </c:when>
-      <c:when test='${form.eventTextRenderer.typeName == "eventTextRendererRange"}'>
-      <c:forEach items="${form.eventTextRenderer.rangeEventValues}" var="rgValue">
-      eventTextRendererEditor.addRangeEventValue("${rgValue.from}", "${rgValue.to}", "${rgValue.text}");
-      </c:forEach>
-      </c:when>
-      <c:otherwise>
-      dojo.debug("Unknown text renderer: ${form.eventTextRenderer.typeName}");
-      </c:otherwise>
+          <c:when test='${form.eventTextRenderer.typeName == "eventTextRendererBinary"}'>
+          </c:when>
+          <c:when test='${form.eventTextRenderer.typeName == "eventTextRendererMultistate"}'>
+              <c:forEach items="${form.eventTextRenderer.multistateEventValues}" var="msValue">
+                eventTextRendererEditor.addMultistateEventValue("${msValue.key}", "<c:out value="${msValue.text}"/>");
+              </c:forEach>
+          </c:when>
+          <c:when test='${form.eventTextRenderer.typeName == "eventTextRendererNone"}'>
+          </c:when>
+          <c:when test='${form.eventTextRenderer.typeName == "eventTextRendererRange"}'>
+              <c:forEach items="${form.eventTextRenderer.rangeEventValues}" var="rgValue">
+                eventTextRendererEditor.addRangeEventValue("${rgValue.from}", "${rgValue.to}", "<c:out value="${rgValue.text}"/>");
+              </c:forEach>
+          </c:when>
+          <c:otherwise>
+            dojo.debug("Unknown text renderer: ${form.eventTextRenderer.typeName}");
+          </c:otherwise>
       </c:choose>
 
       eventTextRendererEditor.change();
@@ -154,13 +152,19 @@
       var typeName = $get("eventTextRendererSelect");
       if (typeName == "eventTextRendererBinary")
         DataPointEditDwr.setBinaryEventTextRenderer($get("eventTextRendererBinaryZero"), $get("eventTextRendererBinaryOne"), callback);
-      else if (typeName == "eventTextRendererMultistate")
+      else if (typeName == "eventTextRendererMultistate") {
+        for(let i = 0; i < multistateEventValues.length; i++) {
+            multistateEventValues[i].text = unescapeHtml(multistateEventValues[i].text);
+        }
         DataPointEditDwr.setMultistateEventRenderer(multistateEventValues, callback);
-      else if (typeName == "eventTextRendererNone")
+      } else if (typeName == "eventTextRendererNone")
         DataPointEditDwr.setNoneEventRenderer(callback);
-      else if (typeName == "eventTextRendererRange")
+      else if (typeName == "eventTextRendererRange") {
+        for(let i = 0; i < rangeEventValues.length; i++) {
+            rangeEventValues[i].text = unescapeHtml(rangeEventValues[i].text);
+        }
         DataPointEditDwr.setRangeEventRenderer(rangeEventValues, callback);
-      else
+      } else
         callback();
     };
 
@@ -184,12 +188,12 @@
         theKey = $get("eventTextRendererMultistateKey");
       var theNumericKey = parseInt(theKey);
       if (isNaN(theNumericKey)) {
-        alert("<fmt:message key="pointEdit.text.errorParsingKey"/>");
+        alert("<spring:message code="pointEdit.text.errorParsingKey"/>");
         return false;
       }
       for (var i=multistateEventValues.length-1; i>=0; i--) {
         if (multistateEventValues[i].key == theNumericKey) {
-          alert("<fmt:message key="pointEdit.text.listContainsKey"/> "+ theNumericKey);
+          alert("<spring:message code="pointEdit.text.listContainsKey"/> "+ theNumericKey);
           return false;
         }
       }
@@ -198,8 +202,9 @@
       theValue.key = theNumericKey;
       if (text)
         theValue.text = text;
-      else
-        theValue.text = $get("eventTextRendererMultistateText");
+      else {
+        theValue.text = escapeHtml($get("eventTextRendererMultistateText"));
+      }
       multistateEventValues[multistateEventValues.length] = theValue;
       this.sortMultistateEventValues();
       this.refreshMultistateEventList();
@@ -226,12 +231,12 @@
       dwr.util.addRows("eventTextRendererMultistateTable", multistateEventValues, [
         function(data) { return data.key; },
         function(data) {
-          return data.text;
+          return "<span>"+ data.text +"</span>";
         },
         function(data) {
           return "<a href='#' onclick='return eventTextRendererEditor.removeMultistateEventValue("+ data.key +
                   ");'><img src='images/bullet_delete.png' width='16' height='16' border='0' "+
-                  "title='<fmt:message key="common.delete"/>'/><\/a>";
+                  "title='<spring:message code="common.delete"/>'/><\/a>";
         }
       ], null);
     };
@@ -242,25 +247,25 @@
       if (!theFrom)
         theFrom = parseFloat($get("eventTextRendererRangeFrom"));
       if (isNaN(theFrom)) {
-        alert("<fmt:message key="pointEdit.text.errorParsingFrom"/>");
+        alert("<spring:message code="pointEdit.text.errorParsingFrom"/>");
         return false;
       }
 
       if (!theTo)
         theTo = parseFloat($get("eventTextRendererRangeTo"));
       if (isNaN(theTo)) {
-        alert("<fmt:message key="pointEdit.text.errorParsingTo"/>");
+        alert("<spring:message code="pointEdit.text.errorParsingTo"/>");
         return false;
       }
 
       if (isNaN(theTo >= theFrom)) {
-        alert("<fmt:message key="pointEdit.text.toGreaterThanFrom"/>");
+        alert("<spring:message code="pointEdit.text.toGreaterThanFrom"/>");
         return false;
       }
 
       for (var i=0; i<rangeEventValues.length; i++) {
         if (rangeEventValues[i].from == theFrom && rangeEventValues[i].to == theTo) {
-          alert("<fmt:message key="pointEdit.text.listContainsRange"/> "+ theFrom +" - "+ theTo);
+          alert("<spring:message code="pointEdit.text.listContainsRange"/> "+ theFrom +" - "+ theTo);
           return false;
         }
       }
@@ -270,8 +275,9 @@
       theValue.to = theTo;
       if (text)
         theValue.text = text;
-      else
-        theValue.text = $get("eventTextRendererRangeText");
+      else {
+        theValue.text = escapeHtml($get("eventTextRendererRangeText"));
+      }
       rangeEventValues[rangeEventValues.length] = theValue;
       this.sortRangeEventValues();
       this.refreshRangeList();
@@ -303,12 +309,12 @@
         function(data) { return data.from; },
         function(data) { return data.to; },
         function(data) {
-          return data.text;
+          return "<span>"+ data.text +"</span>";
         },
         function(data) {
           return "<a href='#' onclick='return eventTextRendererEditor.removeRangeEventValue("+
                   data.from +","+ data.to +");'><img src='images/bullet_delete.png' width='16' "+
-                  "height='16' border='0' title='<fmt:message key="common.delete"/>'/><\/a>";
+                  "height='16' border='0' title='<spring:message code="common.delete"/>'/><\/a>";
         }
       ], null);
     };
diff --git a/WebContent/WEB-INF/jsp/pointEdit/loggingProperties.jsp b/WebContent/WEB-INF/jsp/pointEdit/loggingProperties.jsp
index 0647f902bc..6d209c3a0d 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/loggingProperties.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/loggingProperties.jsp
@@ -117,53 +117,53 @@
 <div class="borderDiv marB marR">
   <table>
     <tr><td colspan="3">
-      <span class="smallTitle"><fmt:message key="pointEdit.logging.props"/></span>
+      <span class="smallTitle"><spring:message code="pointEdit.logging.props"/></span>
       <tag:help id="pointValueLogging"/>
     </td></tr>
     
     <spring:bind path="form.loggingType">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.logging.type"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.logging.type"/></td>
         <td class="formField">
           <sst:select id="loggingType" name="loggingType" onchange="changeLoggingType();" value="${status.value}">
-            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.ON_CHANGE) %>"><fmt:message key="pointEdit.logging.type.change"/></sst:option>
-            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.ALL) %>"><fmt:message key="pointEdit.logging.type.all"/></sst:option>
-            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.NONE) %>"><fmt:message key="pointEdit.logging.type.never"/></sst:option>
-            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.INTERVAL) %>"><fmt:message key="pointEdit.logging.type.interval"/></sst:option>
-            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.ON_TS_CHANGE) %>"><fmt:message key="pointEdit.logging.type.tsChange"/></sst:option>
+            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.ON_CHANGE) %>"><spring:message code="pointEdit.logging.type.change"/></sst:option>
+            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.ALL) %>"><spring:message code="pointEdit.logging.type.all"/></sst:option>
+            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.NONE) %>"><spring:message code="pointEdit.logging.type.never"/></sst:option>
+            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.INTERVAL) %>"><spring:message code="pointEdit.logging.type.interval"/></sst:option>
+            <sst:option value="<%= Integer.toString(DataPointVO.LoggingTypes.ON_TS_CHANGE) %>"><spring:message code="pointEdit.logging.type.tsChange"/></sst:option>
           </sst:select>
         </td>
-        <c:if test="${error.loggingType != null}"><td class="formError"><fmt:message key="${status.loggingType}"/></td></c:if>
+        <c:if test="${error.loggingType != null}"><td class="formError"><spring:message code="${status.loggingType}"/></td></c:if>
       </tr>
     </spring:bind>
     
     <tbody id="intervalLoggingSection" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.logging.period"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.logging.period"/></td>
         <td class="formField">
-          <fmt:message key="pointEdit.logging.every"/> <input type="text" name="intervalLoggingPeriod" value="${form.intervalLoggingPeriod}" class="formShort"/>
+          <spring:message code="pointEdit.logging.every"/> <input type="text" name="intervalLoggingPeriod" value="${form.intervalLoggingPeriod}" class="formShort"/>
           <sst:select name="intervalLoggingPeriodType" value="${form.intervalLoggingPeriodType}">
             <tag:timePeriodOptions sst="true" s="true" min="true" h="true" d="true" w="true" mon="true" y="true"/>
           </sst:select>
         </td>
         <td class="formError">
-          <c:if test="${error.intervalLoggingPeriodType != null}"><fmt:message key="${error.intervalLoggingPeriodType}"/><br/></c:if>
-          <c:if test="${error.intervalLoggingPeriod != null}"><fmt:message key="${error.intervalLoggingPeriod}"/></c:if>
+          <c:if test="${error.intervalLoggingPeriodType != null}"><spring:message code="${error.intervalLoggingPeriodType}"/><br/></c:if>
+          <c:if test="${error.intervalLoggingPeriod != null}"><spring:message code="${error.intervalLoggingPeriod}"/></c:if>
         </td>
       </tr>
       
       <spring:bind path="form.intervalLoggingType">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.logging.valueType"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.logging.valueType"/></td>
           <td class="formField">
             <sst:select id="intervalLoggingType" name="intervalLoggingType" value="${form.intervalLoggingType}">
-              <sst:option value="<%= Integer.toString(DataPointVO.IntervalLoggingTypes.INSTANT) %>"><fmt:message key="pointEdit.logging.valueType.instant"/></sst:option>
-              <sst:option value="<%= Integer.toString(DataPointVO.IntervalLoggingTypes.MAXIMUM) %>"><fmt:message key="pointEdit.logging.valueType.maximum"/></sst:option>
-              <sst:option value="<%= Integer.toString(DataPointVO.IntervalLoggingTypes.MINIMUM) %>"><fmt:message key="pointEdit.logging.valueType.minimum"/></sst:option>
-              <sst:option value="<%= Integer.toString(DataPointVO.IntervalLoggingTypes.AVERAGE) %>"><fmt:message key="pointEdit.logging.valueType.average"/></sst:option>
+              <sst:option value="<%= Integer.toString(DataPointVO.IntervalLoggingTypes.INSTANT) %>"><spring:message code="pointEdit.logging.valueType.instant"/></sst:option>
+              <sst:option value="<%= Integer.toString(DataPointVO.IntervalLoggingTypes.MAXIMUM) %>"><spring:message code="pointEdit.logging.valueType.maximum"/></sst:option>
+              <sst:option value="<%= Integer.toString(DataPointVO.IntervalLoggingTypes.MINIMUM) %>"><spring:message code="pointEdit.logging.valueType.minimum"/></sst:option>
+              <sst:option value="<%= Integer.toString(DataPointVO.IntervalLoggingTypes.AVERAGE) %>"><spring:message code="pointEdit.logging.valueType.average"/></sst:option>
             </sst:select>
           </td>
-          <c:if test="${error.intervalLoggingType != null}"><td class="formError"><fmt:message key="${error.intervalLoggingType}"/></td></c:if>
+          <c:if test="${error.intervalLoggingType != null}"><td class="formError"><spring:message code="${error.intervalLoggingType}"/></td></c:if>
         </tr>
       </spring:bind>
     </tbody>
@@ -171,11 +171,11 @@
     <tbody id="toleranceSection" style="display:none;">
       <spring:bind path="form.tolerance">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.logging.tolerance"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.logging.tolerance"/></td>
           <td class="formField">
             <input id="tolerance" type="text" name="tolerance" value="${status.value}" class="formShort"/>
           </td>
-          <c:if test="${error.tolerance != null}"><td class="formError"><fmt:message key="${error.tolerance}"/></td></c:if>
+          <c:if test="${error.tolerance != null}"><td class="formError"><spring:message code="${error.tolerance}"/></td></c:if>
         </tr>
       </spring:bind>
     </tbody>
@@ -183,80 +183,80 @@
     <tbody id="discardSection" style="display:none;">
       <spring:bind path="form.discardExtremeValues">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.logging.discard"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.logging.discard"/></td>
           <td class="formField">
             <sst:checkbox id="discardExtremeValues" name="discardExtremeValues" selectedValue="${status.value}"
                     onclick="changeDiscard()"/>
           </td>
-          <c:if test="${error.discardExtremeValues != null}"><td class="formError"><fmt:message key="${error.discardExtremeValues}"/></td></c:if>
+          <c:if test="${error.discardExtremeValues != null}"><td class="formError"><spring:message code="${error.discardExtremeValues}"/></td></c:if>
         </tr>
       </spring:bind>
       <spring:bind path="form.discardLowLimit">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.logging.discardLow"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.logging.discardLow"/></td>
           <td class="formField">
             <input id="discardLowLimit" type="text" name="discardLowLimit" value="${status.value}" class="formShort"/>
           </td>
-          <c:if test="${error.discardLowLimit != null}"><td class="formError"><fmt:message key="${error.discardLowLimit}"/></td></c:if>
+          <c:if test="${error.discardLowLimit != null}"><td class="formError"><spring:message code="${error.discardLowLimit}"/></td></c:if>
         </tr>
       </spring:bind>
       <spring:bind path="form.discardHighLimit">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.logging.discardHigh"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.logging.discardHigh"/></td>
           <td class="formField">
             <input id="discardHighLimit" type="text" name="discardHighLimit" value="${status.value}" class="formShort"/>
           </td>
-          <c:if test="${error.discardHighLimit != null}"><td class="formError"><fmt:message key="${error.discardHighLimit}"/></td></c:if>
+          <c:if test="${error.discardHighLimit != null}"><td class="formError"><spring:message code="${error.discardHighLimit}"/></td></c:if>
         </tr>
       </spring:bind>
     </tbody>
 
     <spring:bind path="form.purgeStrategy">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.logging.purgeStrategy"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.logging.purgeStrategy"/></td>
         <td class="formField">
           <sst:select id="purgeStrategy" name="purgeStrategy" onchange="changePurgeStrategy();" value="${status.value}">
-            <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.PERIOD) %>"><fmt:message key="pointEdit.purge.type.period"/></sst:option>
-            <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.LIMIT) %>"><fmt:message key="pointEdit.purge.type.limit"/></sst:option>
+            <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.PERIOD) %>"><spring:message code="pointEdit.purge.type.period"/></sst:option>
+            <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.LIMIT) %>"><spring:message code="pointEdit.purge.type.limit"/></sst:option>
           </sst:select>
         </td>
-        <c:if test="${error.purgeStrategy != null}"><td class="formError"><fmt:message key="${status.purgeStrategy}"/></td></c:if>
+        <c:if test="${error.purgeStrategy != null}"><td class="formError"><spring:message code="${status.purgeStrategy}"/></td></c:if>
       </tr>
     </spring:bind>
 
     <tbody id="purgePeriodSection" style="display:none;">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.logging.purge"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.logging.purge"/></td>
           <td class="formField">
-            <fmt:message key="pointEdit.logging.after"/> <input id="purgePeriod" type="text" name="purgePeriod" value="${form.purgePeriod}" class="formShort"/>
+            <spring:message code="pointEdit.logging.after"/> <input id="purgePeriod" type="text" name="purgePeriod" value="${form.purgePeriod}" class="formShort"/>
             <sst:select id="purgeType" name="purgeType" value="${form.purgeType}">
               <tag:timePeriodOptions sst="true" d="true" w="true" mon="true" y="true"/>
             </sst:select>
           </td>
-          <c:if test="${error.purgePeriod != null}"><td class="formError"><fmt:message key="${error.purgePeriod}"/></td></c:if>
+          <c:if test="${error.purgePeriod != null}"><td class="formError"><spring:message code="${error.purgePeriod}"/></td></c:if>
         </tr>
     </tbody>
 
     <tbody id="purgeLimitSection" style="display:none;">
         <spring:bind path="form.purgeValuesLimit">
             <tr>
-              <td class="formLabelRequired"><fmt:message key="pointEdit.purge.type.limit"/></td>
+              <td class="formLabelRequired"><spring:message code="pointEdit.purge.type.limit"/></td>
               <td class="formField">
                 <input id="purgeValuesLimit" type="text" name="purgeValuesLimit" value="${status.value}" class="formShort"/>
               </td>
-              <c:if test="${error.purgeValuesLimit != null}"><td class="formError"><fmt:message key="${error.purgeValuesLimit}"/></td></c:if>
+              <c:if test="${error.purgeValuesLimit != null}"><td class="formError"><spring:message code="${error.purgeValuesLimit}"/></td></c:if>
             </tr>
         </spring:bind>
     </tbody>
       
     <spring:bind path="form.defaultCacheSize">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.logging.defaultCache"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.logging.defaultCache"/></td>
         <td class="formField">
           <input id="defaultCacheSize" type="text" name="defaultCacheSize" value="${status.value}" class="formShort"/>
-          <input id="clearCacheBtn" type="button" value="<fmt:message key="pointEdit.logging.clearCache"/>" onclick="clearPointCache();"/>
+          <input id="clearCacheBtn" type="button" value="<spring:message code="pointEdit.logging.clearCache"/>" onclick="clearPointCache();"/>
         </td>
-         <c:if test="${error.defaultCacheSize != null}"><td class="formError"><fmt:message key="${error.defaultCacheSize}"/></td></c:if>
+         <c:if test="${error.defaultCacheSize != null}"><td class="formError"><spring:message code="${error.defaultCacheSize}"/></td></c:if>
       </tr>
     </spring:bind>
   </table>
diff --git a/WebContent/WEB-INF/jsp/pointEdit/pointName.jsp b/WebContent/WEB-INF/jsp/pointEdit/pointName.jsp
index eefd6480ed..fb701785f0 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/pointName.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/pointName.jsp
@@ -61,16 +61,16 @@
       <table width="100%" cellspacing="0" cellpadding="0" border="0">
         <spring:bind path="form">
         <c:if test="${error.status != null}">
-            <tr><td colspan="2" class="formError"><fmt:message key="${error.status}"/></td></tr>
+            <tr><td colspan="2" class="formError"><spring:message code="${error.status}"/></td></tr>
         </c:if>
         </spring:bind>
       </table>
     </td>
     <td valign="top" align="right">
-      <fmt:message key="pointEdit.name.goto"/>:&nbsp;
+      <spring:message code="pointEdit.name.goto"/>:&nbsp;
       <sst:select id="allPointsList" value="${form.id}" onchange="window.location='data_point_edit.shtm?dpid='+ this.value;">
         <c:forEach items="${userPoints}" var="point">
-          <sst:option value="${point.id}">${point.extendedName}</sst:option>
+          <sst:option value="${point.id}"><c:out value="${point.extendedName}"/></sst:option>
         </c:forEach>
       </sst:select>
       
diff --git a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp
index 0229afbb55..565115eb52 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp
@@ -31,16 +31,16 @@
     <tr>
       <td colspan="3">
         <img src="images/icon_comp_edit.png"/>
-        <span class="smallTitle"><fmt:message key="pointEdit.props.props"/></span>
+        <span class="smallTitle"><spring:message code="pointEdit.props.props"/></span>
         <tag:help id="dataPointEditing"/>
         <a href="data_point_details.shtm?dpid=${form.id}"><tag:img png="icon_comp" title="pointEdit.props.details"/></a>
       </td>
     </tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="pointEdit.props.ds"/></td>
+      <td class="formLabelRequired"><spring:message code="pointEdit.props.ds"/></td>
       <td colspan="2" class="formField">
-        ${dataSource.name}
+        <c:out value="${dataSource.name}"/>
         <a href="data_source_edit.shtm?dsid=${dataSource.id}&pid=${form.id}"><tag:img png="icon_ds_edit"
                 title="pointEdit.props.editDs"/></a>
       </td>
@@ -48,28 +48,30 @@
       
     <spring:bind path="form.name">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.props.name"/></td>
-        <td class="formField"><input type="text" name="name" value="${status.value}"/></td>
-        <c:if test="${error.name != null}"><td class="formError"><fmt:message key="${error.name}"/></td></c:if>
+        <td class="formLabelRequired"><spring:message code="pointEdit.props.name"/></td>
+        <div>
+        <td class="formField"><input type="text" class="formLongFieldSizing" name="name" value="<c:out value="${status.value}"/>" title="<c:out value="${status.value}"/>"/></td>
+        </div>
+        <c:if test="${error.name != null}"><td class="formError"><spring:message code="${error.name}"/></td></c:if>
       </tr>
     </spring:bind>
 
     <spring:bind path="form.description">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.props.description"/></td>
-        <td class="formField"><input type="text" class="formLong" name="description" value="${status.value}"/></td>
-        <c:if test="${error.description != null}"><td class="formError"><fmt:message key="${error.description}"/></td></c:if>
+        <td class="formLabelRequired"><spring:message code="pointEdit.props.description"/></td>
+        <td class="formField"><input type="text" class="formLong" name="description" value="<c:out value="${status.value}"/>"/></td>
+        <c:if test="${error.description != null}"><td class="formError"><spring:message code="${error.description}"/></td></c:if>
       </tr>
     </spring:bind>
     
     <tbody id="engineeringUnitsSection" style="display:none;">
       <spring:bind path="form.engineeringUnits">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.props.engineeringUnits"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.props.engineeringUnits"/></td>
           <td class="formField">
             <sst:select name="engineeringUnits" value="${status.value}"><tag:engineeringUnits/></sst:select>
           </td>
-          <c:if test="${error.engineeringUnits != null}"><td class="formError"><fmt:message key="${error.engineeringUnits}"/></td></c:if>
+          <c:if test="${error.engineeringUnits != null}"><td class="formError"><spring:message code="${error.engineeringUnits}"/></td></c:if>
         </tr>
       </spring:bind>
     </tbody>
diff --git a/WebContent/WEB-INF/jsp/pointEdit/textRenderer.jsp b/WebContent/WEB-INF/jsp/pointEdit/textRenderer.jsp
index 77fb279e0b..8c99507500 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/textRenderer.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/textRenderer.jsp
@@ -20,17 +20,17 @@
 <div class="borderDiv marB marR">
   <table>
     <tr><td colspan="3">
-      <span class="smallTitle"><fmt:message key="pointEdit.text.props"/></span>
+      <span class="smallTitle"><spring:message code="pointEdit.text.props"/></span>
       <tag:help id="textRenderers"/>
     </td></tr>
     
     <tr>
-      <td class="formLabelRequired"><fmt:message key="pointEdit.text.type"/></td>
+      <td class="formLabelRequired"><spring:message code="pointEdit.text.type"/></td>
       <td class="formField">
         <sst:select id="textRendererSelect" onchange="textRendererEditor.change();"
                 value="${form.textRenderer.typeName}">
           <c:forEach items="${textRenderers}" var="trdef">
-            <sst:option value="${trdef.name}"><fmt:message key="${trdef.nameKey}"/></sst:option>
+            <sst:option value="${trdef.name}"><spring:message code="${trdef.nameKey}"/></sst:option>
           </c:forEach>
         </sst:select>
       </td>
@@ -38,43 +38,43 @@
     
     <tbody id="textRendererAnalog" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.text.format"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.text.format"/></td>
         <td class="formField">
-          <input id="textRendererAnalogFormat" type="text"/>
+          <input id="textRendererAnalogFormat" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.format}" /></c:catch>"/>
           <tag:help id="numberFormats"/>
         </td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.text.suffix"/></td>
-        <td class="formField"><input id="textRendererAnalogSuffix" type="text"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.text.suffix"/></td>
+        <td class="formField"><input id="textRendererAnalogSuffix" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.suffix}" /></c:catch>"/></td>
       </tr>
     </tbody>
     <tbody id="textRendererBinary" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.text.zero"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.text.zero"/></td>
         <td class="formField">
           <table cellspacing="0" cellpadding="0">
             <tr>
-              <td valign="top"><input id="textRendererBinaryZero" type="text"/></td>
+              <td valign="top"><input id="textRendererBinaryZero" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.zeroLabel}" /></c:catch>"/></td>
               <td width="10"></td>
               <td valign="top" align="center">
                 <div dojoType="ColorPalette" palette="3x4" id="textRendererBinaryZeroColour"></div>
-                <a href="#" onclick="textRendererEditor.handlerBinaryZeroColour(null); return false;">(<fmt:message key="pointEdit.text.default"/>)</a>
+                <a href="#" onclick="textRendererEditor.handlerBinaryZeroColour(null); return false;">(<spring:message code="pointEdit.text.default"/>)</a>
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.text.one"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.text.one"/></td>
         <td class="formField">
           <table cellspacing="0" cellpadding="0">
             <tr>
-              <td valign="top"><input id="textRendererBinaryOne" type="text"/></td>
+              <td valign="top"><input id="textRendererBinaryOne" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.oneLabel}" /></c:catch>"/></td>
               <td width="10"></td>
               <td valign="top" align="center">
                 <div dojoType="ColorPalette" palette="3x4" id="textRendererBinaryOneColour"></div>
-                <a href="#" onclick="textRendererEditor.handlerBinaryOneColour(null); return false;">(<fmt:message key="pointEdit.text.default"/>)</a>
+                <a href="#" onclick="textRendererEditor.handlerBinaryOneColour(null); return false;">(<spring:message code="pointEdit.text.default"/>)</a>
               </td>
             </tr>
           </table>
@@ -86,9 +86,9 @@
         <td colspan="2">
           <table>
             <tr>
-              <th><fmt:message key="pointEdit.text.key"/></th>
-              <th><fmt:message key="pointEdit.text.text"/></th>
-              <th><fmt:message key="pointEdit.text.colour"/></th>
+              <th><spring:message code="pointEdit.text.key"/></th>
+              <th><spring:message code="pointEdit.text.text"/></th>
+              <th><spring:message code="pointEdit.text.colour"/></th>
               <td></td>
             </tr>
             <tr>
@@ -96,7 +96,7 @@
               <td valign="top"><input type="text" id="textRendererMultistateText" value="" class="formShort"/></td>
               <td valign="top" align="center">
                 <div dojoType="ColorPalette" palette="3x4" id="textRendererMultistateColour"></div>
-                <a href="#" onclick="textRendererEditor.handlerMultistateColour(null); return false;">(<fmt:message key="pointEdit.text.default"/>)</a>
+                <a href="#" onclick="textRendererEditor.handlerMultistateColour(null); return false;">(<spring:message code="pointEdit.text.default"/>)</a>
               </td>
               <td valign="top">
                 <tag:img png="add" title="common.add" onclick="return textRendererEditor.addMultistateValue();"/>
@@ -111,23 +111,23 @@
     </tbody>
     <tbody id="textRendererPlain" style="display:none;">
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.text.suffix"/></td>
-        <td class="formField"><input id="textRendererPlainSuffix" type="text"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.text.suffix"/></td>
+        <td class="formField"><input id="textRendererPlainSuffix" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.suffix}" /></c:catch>" /></td>
       </tr>
     </tbody>
     <tbody id="textRendererRange" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.text.format"/></td>
-        <td class="formField"><input id="textRendererRangeFormat" type="text"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.text.format"/></td>
+        <td class="formField"><input id="textRendererRangeFormat" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.format}" /></c:catch>" /></td>
       </tr>
       <tr>
         <td colspan="2">
           <table>
             <tr>
-              <th><fmt:message key="pointEdit.text.from"/></th>
-              <th><fmt:message key="pointEdit.text.to"/></th>
-              <th><fmt:message key="pointEdit.text.text"/></th>
-              <th><fmt:message key="pointEdit.text.colour"/></th>
+              <th><spring:message code="pointEdit.text.from"/></th>
+              <th><spring:message code="pointEdit.text.to"/></th>
+              <th><spring:message code="pointEdit.text.text"/></th>
+              <th><spring:message code="pointEdit.text.colour"/></th>
               <td></td>
             </tr>
             <tr>
@@ -136,7 +136,7 @@
               <td valign="top"><input type="text" id="textRendererRangeText" value=""/></td>
               <td valign="top" align="center">
                 <div dojoType="ColorPalette" palette="3x4" id="textRendererRangeColour"></div>
-                <a href="#" onclick="textRendererEditor.handlerRangeColour(null); return false;">(<fmt:message key="pointEdit.text.default"/>)</a>
+                <a href="#" onclick="textRendererEditor.handlerRangeColour(null); return false;">(<spring:message code="pointEdit.text.default"/>)</a>
               </td>
               <td valign="top">
                 <tag:img png="add" title="common.add" onclick="return textRendererEditor.addRangeValue();"/>
@@ -149,15 +149,15 @@
     </tbody>
     <tbody id="textRendererTime" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.text.format"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.text.format"/></td>
         <td class="formField">
-          <input id="textRendererTimeFormat" type="text"/>
+          <input id="textRendererTimeFormat" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.format}" /></c:catch>"/>
           <tag:help id="datetimeFormats"/>
         </td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="pointEdit.text.conversionExponent"/></td>
-        <td class="formField"><input id="textRendererTimeConversionExponent" type="text"/></td>
+        <td class="formLabel"><spring:message code="pointEdit.text.conversionExponent"/></td>
+        <td class="formField"><input id="textRendererTimeConversionExponent" type="text" value="<c:catch var="exception"><c:out value="${form.textRenderer.conversionExponent}" /></c:catch>"/></td>
       </tr>
     </tbody>
   </table>
@@ -185,35 +185,27 @@
           // Figure out which fields to populate with data.
           <c:choose>
             <c:when test='${form.textRenderer.typeName == "textRendererAnalog"}'>
-              $set("textRendererAnalogFormat", "${form.textRenderer.format}");
-              $set("textRendererAnalogSuffix", "${form.textRenderer.suffix}");
             </c:when>
             <c:when test='${form.textRenderer.typeName == "textRendererBinary"}'>
-              $set("textRendererBinaryZero", "${form.textRenderer.zeroLabel}");
               textRendererEditor.handlerBinaryZeroColour("${form.textRenderer.zeroColour}");
-              $set("textRendererBinaryOne", "${form.textRenderer.oneLabel}");
               textRendererEditor.handlerBinaryOneColour("${form.textRenderer.oneColour}");
             </c:when>
             <c:when test='${form.textRenderer.typeName == "textRendererMultistate"}'>
               <c:forEach items="${form.textRenderer.multistateValues}" var="msValue">
-                textRendererEditor.addMultistateValue("${msValue.key}", "${msValue.text}", "${msValue.colour}");
+                textRendererEditor.addMultistateValue("${msValue.key}", "<c:out value="${msValue.text}"/>", "${msValue.colour}");
               </c:forEach>
             </c:when>
             <c:when test='${form.textRenderer.typeName == "textRendererNone"}'>
             </c:when>
             <c:when test='${form.textRenderer.typeName == "textRendererPlain"}'>
-              $set("textRendererPlainSuffix", "${form.textRenderer.suffix}");
             </c:when>
             <c:when test='${form.textRenderer.typeName == "textRendererRange"}'>
-              $set("textRendererRangeFormat", "${form.textRenderer.format}");
               <c:forEach items="${form.textRenderer.rangeValues}" var="rgValue">
-                textRendererEditor.addRangeValue("${rgValue.from}", "${rgValue.to}", "${rgValue.text}",
+                textRendererEditor.addRangeValue("${rgValue.from}", "${rgValue.to}", "<c:out value="${rgValue.text}"/>",
                         "${rgValue.colour}");
               </c:forEach>
             </c:when>
             <c:when test='${form.textRenderer.typeName == "textRendererTime"}'>
-              $set("textRendererTimeFormat", "${form.textRenderer.format}");
-              $set("textRendererTimeConversionExponent", "${form.textRenderer.conversionExponent}");
             </c:when>
             <c:otherwise>
               dojo.debug("Unknown text renderer: ${form.textRenderer.typeName}");
@@ -239,15 +231,21 @@
               DataPointEditDwr.setBinaryTextRenderer($get("textRendererBinaryZero"), 
                       dojo.widget.byId("textRendererBinaryZeroColour").selectedColour, $get("textRendererBinaryOne"),
                       dojo.widget.byId("textRendererBinaryOneColour").selectedColour, callback);
-          else if (typeName == "textRendererMultistate")
+          else if (typeName == "textRendererMultistate") {
+              for(let i = 0; i < multistateValues.length; i++) {
+                  multistateValues[i].text = unescapeHtml(multistateValues[i].text);
+              }
               DataPointEditDwr.setMultistateRenderer(multistateValues, callback);
-          else if (typeName == "textRendererNone")
+          } else if (typeName == "textRendererNone")
               DataPointEditDwr.setNoneRenderer(callback);
           else if (typeName == "textRendererPlain")
               DataPointEditDwr.setPlainRenderer($get("textRendererPlainSuffix"), callback);
-          else if (typeName == "textRendererRange")
+          else if (typeName == "textRendererRange") {
+              for(let i = 0; i < rangeValues.length; i++) {
+                  rangeValues[i].text = unescapeHtml(rangeValues[i].text);
+              }
               DataPointEditDwr.setRangeRenderer($get("textRendererRangeFormat"), rangeValues, callback);
-          else if (typeName == "textRendererTime")
+          } else if (typeName == "textRendererTime")
               DataPointEditDwr.setTimeTextRenderer($get("textRendererTimeFormat"),
                       $get("textRendererTimeConversionExponent"), callback);
           else
@@ -276,12 +274,12 @@
               theKey = $get("textRendererMultistateKey");
           var theNumericKey = parseInt(theKey);
           if (isNaN(theNumericKey)) {
-              alert("<fmt:message key="pointEdit.text.errorParsingKey"/>");
+              alert("<spring:message code="pointEdit.text.errorParsingKey"/>");
               return false;
           }
           for (var i=multistateValues.length-1; i>=0; i--) {
               if (multistateValues[i].key == theNumericKey) {
-                  alert("<fmt:message key="pointEdit.text.listContainsKey"/> "+ theNumericKey);
+                  alert("<spring:message code="pointEdit.text.listContainsKey"/> "+ theNumericKey);
                   return false;
               }
           }
@@ -290,8 +288,9 @@
           theValue.key = theNumericKey;
           if (text)
               theValue.text = text;
-          else
-              theValue.text = $get("textRendererMultistateText");
+          else {
+              theValue.text = escapeHtml($get("textRendererMultistateText"));
+          }
           if (colour)
               theValue.colour = colour;
           else
@@ -321,15 +320,16 @@
           dwr.util.removeAllRows("textRendererMultistateTable");
           dwr.util.addRows("textRendererMultistateTable", multistateValues, [
                   function(data) { return data.key; },
-                  function(data) { 
+                  function(data) {
+                      let dataText = data.text;
                       if (data.colour)
-                          return "<span style='color:"+ data.colour +"'>"+ data.text +"</span>";
-                      return data.text;
+                          return "<span style='color:"+ data.colour +"'>"+ dataText +"</span>";
+                      return "<span>"+ dataText +"</span>";
                   },
                   function(data) {
                       return "<a href='#' onclick='return textRendererEditor.removeMultistateValue("+ data.key +
                              ");'><img src='images/bullet_delete.png' width='16' height='16' border='0' "+
-                             "title='<fmt:message key="common.delete"/>'/><\/a>";
+                             "title='<spring:message code="common.delete"/>'/><\/a>";
                   }
                   ], null);
       };
@@ -340,25 +340,25 @@
           if (!theFrom)
               theFrom = parseFloat($get("textRendererRangeFrom"));
           if (isNaN(theFrom)) {
-              alert("<fmt:message key="pointEdit.text.errorParsingFrom"/>");
+              alert("<spring:message code="pointEdit.text.errorParsingFrom"/>");
               return false;
           }
           
           if (!theTo)
               theTo = parseFloat($get("textRendererRangeTo"));
           if (isNaN(theTo)) {
-              alert("<fmt:message key="pointEdit.text.errorParsingTo"/>");
+              alert("<spring:message code="pointEdit.text.errorParsingTo"/>");
               return false;
           }
           
           if (isNaN(theTo >= theFrom)) {
-              alert("<fmt:message key="pointEdit.text.toGreaterThanFrom"/>");
+              alert("<spring:message code="pointEdit.text.toGreaterThanFrom"/>");
               return false;
           }
           
           for (var i=0; i<rangeValues.length; i++) {
               if (rangeValues[i].from == theFrom && rangeValues[i].to == theTo) {
-                  alert("<fmt:message key="pointEdit.text.listContainsRange"/> "+ theFrom +" - "+ theTo);
+                  alert("<spring:message code="pointEdit.text.listContainsRange"/> "+ theFrom +" - "+ theTo);
                   return false;
               }
           }
@@ -368,8 +368,9 @@
           theValue.to = theTo;
           if (text)
               theValue.text = text;
-          else
-              theValue.text = $get("textRendererRangeText");
+          else {
+              theValue.text = escapeHtml($get("textRendererRangeText"));
+          }
           if (colour)
               theValue.colour = colour;
           else
@@ -404,15 +405,16 @@
           dwr.util.addRows("textRendererRangeTable", rangeValues, [
                   function(data) { return data.from; },
                   function(data) { return data.to; },
-                  function(data) { 
+                  function(data) {
+                      let dataText = data.text;
                       if (data.colour)
-                          return "<span style='color:"+ data.colour +"'>"+ data.text +"</span>";
-                      return data.text;
+                          return "<span style='color:"+ data.colour +"'>"+ dataText +"</span>";
+                      return "<span>"+ dataText +"</span>";
                   },
                   function(data) {
                       return "<a href='#' onclick='return textRendererEditor.removeRangeValue("+
                              data.from +","+ data.to +");'><img src='images/bullet_delete.png' width='16' "+
-                             "height='16' border='0' title='<fmt:message key="common.delete"/>'/><\/a>";
+                             "height='16' border='0' title='<spring:message code="common.delete"/>'/><\/a>";
                   }
                   ], null);
       };
diff --git a/WebContent/WEB-INF/jsp/pointEdit/valuePurge.jsp b/WebContent/WEB-INF/jsp/pointEdit/valuePurge.jsp
index a36df65b0d..f71f557b30 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/valuePurge.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/valuePurge.jsp
@@ -33,7 +33,7 @@
         DataPointEditDwr.purgeNowValuesLimit($get("purgeNowValuesLimit"), purgeNowCB);
 
     if (purgeStrategy == <%= DataPointVO.PurgeStrategy.ALL %>) {
-        if (!confirm("<fmt:message key="pointEdit.purge.confirm"/>"))
+        if (!confirm("<spring:message code="pointEdit.purge.confirm"/>"))
                   return;
         DataPointEditDwr.purgeNowAll(purgeNowCB);
     }
@@ -43,7 +43,7 @@
       setDisabled("purgeNowBtn", false);
       stopImageFader("purgeNowImg");
       hide("purgeNowWarn");
-      alert(""+ result +" <fmt:message key="pointEdit.purge.result"/>");
+      alert(""+ result +" <spring:message code="pointEdit.purge.result"/>");
   }
 
   function changePurgeNowStrategy() {
@@ -83,18 +83,18 @@
 <div class="borderDiv marB marR" style="margin:20px; padding:10px 10px 10px 10px; border-color:blue; max-width: 800px;">
   <table>
     <tr><td colspan="3">
-      <span class="smallTitle"><fmt:message key="pointEdit.purge.purgeNow"/></span>
+      <span class="smallTitle"><spring:message code="pointEdit.purge.purgeNow"/></span>
       <tag:help id="pointValueLogPurging"/>
     </td></tr>
 
     <spring:bind path="form.purgeStrategy">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.logging.purgeStrategy"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.logging.purgeStrategy"/></td>
           <td class="formField">
             <sst:select id="purgeNowStrategy" name="purgeNowStrategy" onchange="changePurgeNowStrategy();" value="${status.value}">
-              <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.PERIOD) %>"><fmt:message key="pointEdit.purge.type.period"/></sst:option>
-              <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.LIMIT) %>"><fmt:message key="pointEdit.purge.type.limit"/></sst:option>
-              <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.ALL) %>"><fmt:message key="pointEdit.purge.type.all"/></sst:option>
+              <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.PERIOD) %>"><spring:message code="pointEdit.purge.type.period"/></sst:option>
+              <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.LIMIT) %>"><spring:message code="pointEdit.purge.type.limit"/></sst:option>
+              <sst:option value="<%= Integer.toString(DataPointVO.PurgeStrategy.ALL) %>"><spring:message code="pointEdit.purge.type.all"/></sst:option>
             </sst:select>
           </td>
         </tr>
@@ -102,7 +102,7 @@
 
     <tbody id="purgeNowPeriodSection">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="pointEdit.purge.olderThan"/></td>
+          <td class="formLabelRequired"><spring:message code="pointEdit.purge.olderThan"/></td>
           <td class="formField">
             <input id="purgeNowPeriod" type="text" value="${form.purgePeriod}" class="formShort"/>
             <sst:select id="purgeNowType" value="${form.purgeType}">
@@ -114,7 +114,7 @@
 
     <tbody id="purgeNowLimitSection" style="display:none;">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="pointEdit.purge.type.limit"/></td>
+        <td class="formLabelRequired"><spring:message code="pointEdit.purge.type.limit"/></td>
         <td class="formField">
           <input id="purgeNowValuesLimit" type="text" name="purgeNowValuesLimit" value="${form.purgeValuesLimit}" class="formShort"/>
         </td>
@@ -123,7 +123,7 @@
     
     <tr>
       <td colspan="2" align="center">
-        <input id="purgeNowBtn" type="button" value="<fmt:message key="pointEdit.purge.purgeNow"/>" onclick="purgeNow();"/>
+        <input id="purgeNowBtn" type="button" value="<spring:message code="pointEdit.purge.purgeNow"/>" onclick="purgeNow();"/>
       </td>
     </tr>
     
@@ -131,7 +131,7 @@
       <tr>
         <td colspan="2" align="center" class="formError">
           <img id="purgeNowImg" src="images/warn.png"/>
-          <fmt:message key="pointEdit.purge.warn"/>
+          <spring:message code="pointEdit.purge.warn"/>
         </td>
       </tr>
     </tbody>
diff --git a/WebContent/WEB-INF/jsp/pointHierarchySLTS.jsp b/WebContent/WEB-INF/jsp/pointHierarchySLTS.jsp
index 5070db6808..8f3011769b 100644
--- a/WebContent/WEB-INF/jsp/pointHierarchySLTS.jsp
+++ b/WebContent/WEB-INF/jsp/pointHierarchySLTS.jsp
@@ -3,6 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ taglib prefix='c' uri='http://java.sun.com/jsp/jstl/core'%>
 <%@ taglib prefix="tag" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -168,110 +169,110 @@ thead th {
 
 							<li role="presentation"><a href="watch_list.shtm"
 								class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.watchlists.tooltip"/>'><img
+								title='<spring:message code="menu.watchlists.tooltip"/>'><img
 									src="images/eye.png"></a></li>
 							<li role="presentation"><a href="views.shtm"
 								class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.graphicalviews.tooltip"/>'><img
+								title='<spring:message code="menu.graphicalviews.tooltip"/>'><img
 									src="images/icon_view.png"></a></li>
 							<li role="presentation"><a href="events.shtm"
 								class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.alarms.tooltip"/>'><img
+								title='<spring:message code="menu.alarms.tooltip"/>'><img
 									src="images/flag_white.png"></a></li>
 							<li role="presentation"><a href="reports.shtm"
 								class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.reports.tooltip"/>'><img
+								title='<spring:message code="menu.reports.tooltip"/>'><img
 									src="images/report.png"></a></li>
 
 							<c:if test="${sessionUser.dataSourcePermission}">
 								<span class="btn-separator"></span>
 								<li role="presentation"><a href="event_handlers.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.event_handlers.tooltip"/>'><img
+									title='<spring:message code="menu.event_handlers.tooltip"/>'><img
 										src="images/cog.png" /></a></li>
 								<li role="presentation"><a href="data_sources.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.data_source.tooltip"/>'><img
+									title='<spring:message code="menu.data_source.tooltip"/>'><img
 										src="images/icon_ds.png" /></a></li>
 								<li role="presentation"><a href="scheduled_events.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.scheduled_events.tooltip"/>'><img
+									title='<spring:message code="menu.scheduled_events.tooltip"/>'><img
 										src="images/clock.png" /></a></li>
 								<li role="presentation"><a href="compound_events.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.compound_event_detectors.tooltip"/>'><img
+									title='<spring:message code="menu.compound_event_detectors.tooltip"/>'><img
 										src="images/multi_bell.png" /></a></li>
 								<li role="presentation"><a href="point_links.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.point_links.tooltip"/>'><img
+									title='<spring:message code="menu.point_links.tooltip"/>'><img
 										src="images/link.png" /></a></li>
 								<li role="presentation"><a href="scripting.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.scripting.tooltip"/>'><img
+									title='<spring:message code="menu.scripting.tooltip"/>'><img
 										src="images/script_gear.png" /></a></li>
 								<span class="btn-separator"></span>
 							</c:if>
 
 							<li role="presentation"><a href="users.shtm"
 								data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.users.tooltip"/>'><img
+								title='<spring:message code="menu.users.tooltip"/>'><img
 									src="images/user.png" /></a></li>
 							<c:if test="${sessionUser.admin}">
 								<li role="presentation"><a href="usersProfiles.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.users_profiles.tooltip"/>'><img
+									title='<spring:message code="menu.users_profiles.tooltip"/>'><img
 										src="images/user_ds.png" /></a></li>
 								<li role="presentation" class="active"><a
 									href="pointHierarchySLTS" class='btn btn-xs'
 									data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.point_hierarchy.tooltip"/>'><img
+									title='<spring:message code="menu.point_hierarchy.tooltip"/>'><img
 										src="images/folder_brick.png" /></a></li>
 								<li role="presentation"><a href="mailing_lists.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.mailing_lists.tooltip"/>'><img
+									title='<spring:message code="menu.mailing_lists.tooltip"/>'><img
 										src="images/book.png" /></a></li>
 								<li role="presentation"><a href="publishers.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.publishers.tooltip"/>'><img
+									title='<spring:message code="menu.publishers.tooltip"/>'><img
 										src="images/transmit.png" /></a></li>
 								<li role="presentation"><a href="maintenance_events.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.maintenance_events.tooltip"/>'><img
+									title='<spring:message code="menu.maintenance_events.tooltip"/>'><img
 										src="images/hammer.png" /></a></li>
 								<li role="presentation"><a href="system_settings.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.system_setings.tooltip"/>'><img
+									title='<spring:message code="menu.system_setings.tooltip"/>'><img
 										src="images/application_form.png" /></a></li>
 								<li role="presentation"><a href="emport.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.import_export.tooltip"/>'><img
+									title='<spring:message code="menu.import_export.tooltip"/>'><img
 										src="images/script_code.png" /></a></li>
 								<li role="presentation"><a href="sql.shtm"
 									class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.sql.tooltip"/>'><img
+									title='<spring:message code="menu.sql.tooltip"/>'><img
 										src="images/script.png" /></a></li>
 								<span class="btn-separator"></span>
 							</c:if>
 
 							<li role="presentation"><a href="logout.htm"
 								class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.logout.tooltip"/>'><img
+								title='<spring:message code="menu.logout.tooltip"/>'><img
 									src="images/control_stop_blue.png"></a></li>
 							<li role="presentation"><a href="help.shtm"
 								class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.help.tooltip"/>'><img
+								title='<spring:message code="menu.help.tooltip"/>'><img
 									src="images/help.png"></a></li>
 						</c:if>
 						<c:if test="${empty sessionUser}">
 							<li role="presentation"><a href="login.htm"
 								class='btn btn-xs' data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.login.tooltip"/>'><img
+								title='<spring:message code="menu.login.tooltip"/>'><img
 									src="images/control_play_blue.png"></a></li>
 						</c:if>
 						<div class="btn-group pull-right menu">
 							<button class="btn dropdown-toggle btn-xs" data-toggle="dropdown"
 								data-toggle="tooltip" data-placement="top"
-								title='<fmt:message key="menu.change_language.tooltip"/>'>
+								title='<spring:message code="menu.change_language.tooltip"/>'>
 								<img src="images/world.png" alt=""> <span
 									class="caret" />
 							</button>
@@ -291,8 +292,8 @@ thead th {
 						</div>
 						<div class="btn-group pull-right menu">
 							<c:if test="${!empty sessionUser}">
-								<a href="" class="btn btn-xs"><span><fmt:message
-											key="header.user" />: <b><c:out value="${sessionUser.username}"/></b>
+								<a href="" class="btn btn-xs"><span><spring:message
+											code="header.user" />: <b><c:out value="${sessionUser.username}"/></b>
 									</mark></span></a>
 
 								<!-- TODO REST MiscDwr.toggleUserMuted(setUserMuted)
@@ -362,33 +363,33 @@ thead th {
 
 					<div class="panel panel-default">
 						<div class="panel-heading help">
-							<b><fmt:message key="pointHierarchySLTS.pointHierarchy" /></b>
+							<b><spring:message code="pointHierarchySLTS.pointHierarchy" /></b>
 						</div>
 						<div class="menu panel-heading help">
 							<div class="btn-group">
 								<button id="addNode" class="btn btn-success"
 									data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.point_hierarchy.add.tooltip"/>'>
+									title='<spring:message code="menu.point_hierarchy.add.tooltip"/>'>
 									<span class="glyphicon glyphicon-plus"></span>
 								</button>
 								<button id="editNode" class="btn btn-warning"
 									data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.point_hierarchy.edit.tooltip"/>'>
+									title='<spring:message code="menu.point_hierarchy.edit.tooltip"/>'>
 									<span class="glyphicon glyphicon-pencil"></span>
 								</button>
 								<button id="deleteNode" class="btn btn-danger"
 									data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.point_hierarchy.delete.tooltip"/>'>
+									title='<spring:message code="menu.point_hierarchy.delete.tooltip"/>'>
 									<span class="glyphicon glyphicon-minus"></span>
 								</button>
 								<button id="reloadNode" class="btn btn-primary"
 									data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.point_hierarchy.refresh.tooltip"/>'>
+									title='<spring:message code="menu.point_hierarchy.refresh.tooltip"/>'>
 									<span class="glyphicon glyphicon-refresh"></span>
 								</button>
 								<button id="infoNode" class="btn btn-primary"
 									data-toggle="tooltip" data-placement="top"
-									title='<fmt:message key="menu.point_hierarchy.info.tooltip"/>'>
+									title='<spring:message code="menu.point_hierarchy.info.tooltip"/>'>
 									<span class="glyphicon glyphicon-info-sign"></span>
 								</button>
 							</div>
@@ -426,8 +427,8 @@ thead th {
 				<td colspan="2">&nbsp;</td>
 			</tr>
 			<tr>
-				<td colspan="2" class="footer" align="center">&copy;2012-${toYear} Scada-LTS <fmt:message
-						key="footer.rightsReserved" /></td>
+				<td colspan="2" class="footer" align="center">&copy;2012-${toYear} Scada-LTS <spring:message
+						code="footer.rightsReserved" /></td>
 			</tr>
 		</table>
 	</div>
@@ -494,13 +495,13 @@ function setAlarmLevelText(alarmLevel, textNode) {
     if (alarmLevel == 0)
         textNode.innerHTML = "";
     else if (alarmLevel == 1)
-        textNode.innerHTML = '<fmt:message key="common.alarmLevel.info"/>';
+        textNode.innerHTML = '<spring:message code="common.alarmLevel.info"/>';
     else if (alarmLevel == 2)
-        textNode.innerHTML = '<fmt:message key="common.alarmLevel.urgent"/>';
+        textNode.innerHTML = '<spring:message code="common.alarmLevel.urgent"/>';
     else if (alarmLevel == 3)
-        textNode.innerHTML = '<fmt:message key="common.alarmLevel.critical"/>';
+        textNode.innerHTML = '<spring:message code="common.alarmLevel.critical"/>';
     else if (alarmLevel == 4)
-        textNode.innerHTML = '<fmt:message key="common.alarmLevel.lifeSafety"/>';
+        textNode.innerHTML = '<spring:message code="common.alarmLevel.lifeSafety"/>';
     else
         textNode.innerHTML = "Unknown: "+ alarmLevel;
 }
@@ -523,41 +524,41 @@ function updateImg(imgNode, src, text, visible, styleType) {
 
 
 var messages = {
-  move: "<fmt:message key="pointHierarchySLTS.move"/>",
-  folderNotMove: "<fmt:message key="pointHierarchySLTS.folderNotMove"/>",
-  close: "<fmt:message key="pointHierarchySLTS.close"/>",
-  yes: "<fmt:message key="pointHierarchySLTS.yes"/>",
-  folder: "<fmt:message key="pointHierarchySLTS.folder"/>",
-  folderChange: "<fmt:message key="pointHierarchySLTS.folderChange"/>",
-  confirmDelete: "<fmt:message key="pointHierarchySLTS.confirmDelete"/>",
-  folderRemoved: "<fmt:message key="pointHierarchySLTS.folderRemoved"/>",
-  key: "<fmt:message key="pointHierarchySLTS.key"/>",
-  title: "<fmt:message key="pointHierarchySLTS.title"/>",
-  msg: "<fmt:message key="pointHierarchySLTS.msg"/>",
-  pleaseSelectElement: "<fmt:message key="pointHierarchySLTS.pleaseSelectElement"/>",
-  pleaseSelectElementFolder: "<fmt:message key="pointHierarchySLTS.pleaseSelectElementFolder"/>",
-  weOnlyEditFolder: "<fmt:message key="pointHierarchySLTS.weOnlyEditFolder"/>",
-  editFolder: "<fmt:message key="pointHierarchySLTS.editFolder"/>",
-  titleEdit: "<fmt:message key="pointHierarchySLTS.titleEdit"/>",
-  oldTitle: "<fmt:message key="pointHierarchySLTS.oldTitle"/>",
-  newTitle: "<fmt:message key="pointHierarchySLTS.newTitle"/>",
-  folderNotEdit: "<fmt:message key="pointHierarchySLTS.folderNotEdit"/>",
-  errorThrown: "<fmt:message key="pointHierarchySLTS.errorThrown"/>",
-  keyParent: "<fmt:message key="pointHierarchySLTS.keyParent"/>",
-  parent: "<fmt:message key="pointHierarchySLTS.parent"/>",
-  folderNotRemove: "<fmt:message key="pointHierarchySLTS.folderNotRemove"/>",
-  removeFolder: "<fmt:message key="pointHierarchySLTS.removeFolder"/>",
-  warning: "<fmt:message key="pointHierarchySLTS.warning"/>",
-  info: "<fmt:message key="pointHierarchySLTS.info"/>",
-  isFolder: "<fmt:message key="pointHierarchySLTS.isFolder"/>",
-  dataSource: "<fmt:message key="pointHierarchySLTS.dataSource"/>",
-  xid: "<fmt:message key="pointHierarchySLTS.xid"/>",
-  type: "<fmt:message key="pointHierarchySLTS.type"/>",
-  changeOfLanguageFailed: "<fmt:message key="pointHierarchySLTS.changeOfLanguageFailed"/>",
-  warningDontRemoveDataPointInRoot: "<fmt:message key="pointHierarchySLTS.warningDontRemoveDataPointInRoot"/>",
-  moveDataPointToRoot: "<fmt:message key="pointHierarchySLTS.moveDataPointToRoot"/>",
-  areYouSureToMoveElement: "<fmt:message key="pointHierarchySLTS.areYouSureToMoveElement"/>",
-  movedElement: "<fmt:message key="pointHierarchySLTS.movedElement"/>"
+  move: "<spring:message code="pointHierarchySLTS.move"/>",
+  folderNotMove: "<spring:message code="pointHierarchySLTS.folderNotMove"/>",
+  close: "<spring:message code="pointHierarchySLTS.close"/>",
+  yes: "<spring:message code="pointHierarchySLTS.yes"/>",
+  folder: "<spring:message code="pointHierarchySLTS.folder"/>",
+  folderChange: "<spring:message code="pointHierarchySLTS.folderChange"/>",
+  confirmDelete: "<spring:message code="pointHierarchySLTS.confirmDelete"/>",
+  folderRemoved: "<spring:message code="pointHierarchySLTS.folderRemoved"/>",
+  key: "<spring:message code="pointHierarchySLTS.key"/>",
+  title: "<spring:message code="pointHierarchySLTS.title"/>",
+  msg: "<spring:message code="pointHierarchySLTS.msg"/>",
+  pleaseSelectElement: "<spring:message code="pointHierarchySLTS.pleaseSelectElement"/>",
+  pleaseSelectElementFolder: "<spring:message code="pointHierarchySLTS.pleaseSelectElementFolder"/>",
+  weOnlyEditFolder: "<spring:message code="pointHierarchySLTS.weOnlyEditFolder"/>",
+  editFolder: "<spring:message code="pointHierarchySLTS.editFolder"/>",
+  titleEdit: "<spring:message code="pointHierarchySLTS.titleEdit"/>",
+  oldTitle: "<spring:message code="pointHierarchySLTS.oldTitle"/>",
+  newTitle: "<spring:message code="pointHierarchySLTS.newTitle"/>",
+  folderNotEdit: "<spring:message code="pointHierarchySLTS.folderNotEdit"/>",
+  errorThrown: "<spring:message code="pointHierarchySLTS.errorThrown"/>",
+  keyParent: "<spring:message code="pointHierarchySLTS.keyParent"/>",
+  parent: "<spring:message code="pointHierarchySLTS.parent"/>",
+  folderNotRemove: "<spring:message code="pointHierarchySLTS.folderNotRemove"/>",
+  removeFolder: "<spring:message code="pointHierarchySLTS.removeFolder"/>",
+  warning: "<spring:message code="pointHierarchySLTS.warning"/>",
+  info: "<spring:message code="pointHierarchySLTS.info"/>",
+  isFolder: "<spring:message code="pointHierarchySLTS.isFolder"/>",
+  dataSource: "<spring:message code="pointHierarchySLTS.dataSource"/>",
+  xid: "<spring:message code="pointHierarchySLTS.xid"/>",
+  type: "<spring:message code="pointHierarchySLTS.type"/>",
+  changeOfLanguageFailed: "<spring:message code="pointHierarchySLTS.changeOfLanguageFailed"/>",
+  warningDontRemoveDataPointInRoot: "<spring:message code="pointHierarchySLTS.warningDontRemoveDataPointInRoot"/>",
+  moveDataPointToRoot: "<spring:message code="pointHierarchySLTS.moveDataPointToRoot"/>",
+  areYouSureToMoveElement: "<spring:message code="pointHierarchySLTS.areYouSureToMoveElement"/>",
+  movedElement: "<spring:message code="pointHierarchySLTS.movedElement"/>"
 };
 	var glyph_opts = {
     	    map: {
@@ -601,7 +602,7 @@ var messages = {
     	$.ajax({
             type: "GET",
         	dataType: "json",
-        	url:myLocation+"/pointHierarchy/paths/"+key+"/"+folder,
+        	url:myLocation+"pointHierarchy/paths/"+key+"/"+folder,
         	success: function(msg){
         		var path="/";
         		if (msg.length>0) {
@@ -753,7 +754,7 @@ var messages = {
                            $.ajax({
     	 			            type: "POST",
     	 			        	dataType: "json",
-    	 			        	url:myLocation+'/pointHierarchy/move/'+toMove.key+'/'+toMove.oldParentId+'/'+toMove.newParentId+'/'+nodeDragAndDrop.isFolder(),
+    	 			        	url:myLocation+'pointHierarchy/move/'+toMove.key+'/'+toMove.oldParentId+'/'+toMove.newParentId+'/'+nodeDragAndDrop.isFolder(),
     	 			        	success: function(msg){
     	 			        	  $button.hide();
     	 			 		      $button.stopSpin();
@@ -786,7 +787,7 @@ var messages = {
     	      glyph: glyph_opts,
     	      selectMode: 2,
     	      source: {
-    	        url: myLocation+"/pointHierarchy/0",
+    	        url: myLocation+"pointHierarchy/0",
     	        debugDelay: 0,
     	        cache: false},
     	      toggleEffect: { effect: "drop", options: {direction: "left"}, duration: 100 },
@@ -802,7 +803,7 @@ var messages = {
     	      },
     	      lazyLoad: function(event, data) {
     	    	data.result = {
-    	    	 url: myLocation+"/pointHierarchy/"+data.node.key,
+    	    	 url: myLocation+"pointHierarchy/"+data.node.key,
     	         cache: false,
     	         debugDelay: 0
     	         };
@@ -832,7 +833,7 @@ var messages = {
  		          $.ajax({
 		            type: "POST",
 		        	dataType: "json",
-		        	url:myLocation+"/pointHierarchy/new/0/"+dialog.getModalBody().find('input').val(),
+		        	url:myLocation+"pointHierarchy/new/0/"+dialog.getModalBody().find('input').val(),
 		        	success: function(msg){
 		        	  var titleNewNode = dialog.getModalBody().find('input').val();
 		        	  dialog.getModalBody().html('<div><h3>'+messages.folder+':</h3><ul><li>'+messages.key+':<b>'+msg+'</b></li><li>'+messages.title+':<b>'+titleNewNode+'</b></li></ul></div>');
@@ -899,7 +900,7 @@ var messages = {
 				           $.ajax({
 				        	   type: "POST",
 				        	   dataType: "json",
-				        	   url:myLocation+"/pointHierarchy/del/"+getParentId(nodeActivate)+"/"+nodeActivate.key+"/"+nodeActivate.isFolder(),
+				        	   url:myLocation+"pointHierarchy/del/"+getParentId(nodeActivate)+"/"+nodeActivate.key+"/"+nodeActivate.isFolder(),
 				        	   success: function(msg){
 				        		   dialog.getModalBody().html('<div><h3>'+messages.folderRemoved+':</h3><ul><li>'+messages.key+':<b>'+nodeActivate.key+'</b></li><li>'+messages.title+':<b>'+nodeActivate.title+'</b></li><li>'+messages.msg+':'+msg+'</li></ul></div>');
 						           $button.hide();
@@ -949,7 +950,7 @@ var messages = {
     					           $.ajax({
     					        	   type: "POST",
     					        	   dataType: "json",
-    					        	   url:myLocation+"/pointHierarchy/del/"+getParentId(nodeActivate)+"/"+nodeActivate.key+"/"+nodeActivate.isFolder(),
+    					        	   url:myLocation+"pointHierarchy/del/"+getParentId(nodeActivate)+"/"+nodeActivate.key+"/"+nodeActivate.isFolder(),
     					        	   success: function(msg){
     					        		   dialog.getModalBody().html('<div><h3>'+messages.movedElement+':</h3><ul><li>'+messages.key+':<b>'+nodeActivate.key+'</b></li><li>'+messages.title+':<b>'+nodeActivate.title+'</b></li><li>'+messages.msg+':'+msg+'</li></ul></div>');
     							           $button.hide();
@@ -1032,7 +1033,7 @@ var messages = {
 		           $.ajax({
 			            type: "POST",
 			        	dataType: "json",
-			        	url:myLocation+"/pointHierarchy/edit/"+getParentId(nodeActivate)+"/"+nodeActivate.key+"/"+newTitle,
+			        	url:myLocation+"pointHierarchy/edit/"+getParentId(nodeActivate)+"/"+nodeActivate.key+"/"+newTitle,
 			        	success: function(msg){
 			        	  var titleNewNode = dialog.getModalBody().find('input').val();
 			        	  dialog.getModalBody().html('<div><h3>'+messages.folderChange+':</h3><ul><li>'+messages.key+':<b>'+nodeActivate.key+'</b></li><li>'+messages.oldTitle+':<b>'+nodeActivate.title+'</b></li><li>'+messages.newTitle+':<b>'+newTitle+'</b></li></ul></div>');
@@ -1140,7 +1141,7 @@ var messages = {
     		 $.ajax({
 		            type: "POST",
 		        	dataType: "json",
-		        	url:myLocation+"/viewutil/"+locale,
+		        	url:myLocation+"viewutil/"+locale,
 		        	success: function(msg){
 		        		location.reload();
 		        	},
@@ -1227,7 +1228,7 @@ var messages = {
         	$.ajax({
 	            type: "GET",
 	        	dataType: "json",
-	        	url:myLocation+"/pointHierarchy/find/"+queryGlobal+"/"+page,
+	        	url:myLocation+"pointHierarchy/find/"+queryGlobal+"/"+page,
 	        	success: function(msg){
 
 	        	  	if(msg !== undefined ) {
diff --git a/WebContent/WEB-INF/jsp/pointLinks.jsp b/WebContent/WEB-INF/jsp/pointLinks.jsp
index 5abbb090ba..15c6f146b9 100644
--- a/WebContent/WEB-INF/jsp/pointLinks.jsp
+++ b/WebContent/WEB-INF/jsp/pointLinks.jsp
@@ -80,11 +80,11 @@
                     editingPointLink.id = response.data.plId;
                     appendPointLink(editingPointLink.id);
                     startImageFader($("pl"+ editingPointLink.id +"Img"));
-                    setUserMessage("<fmt:message key="pointLinks.pointLinkAdded"/>");
+                    setUserMessage("<spring:message code="pointLinks.pointLinkAdded"/>");
                     show($("deletePointLinkImg"));
                 }
                 else
-                    setUserMessage("<fmt:message key="pointLinks.pointLinkSaved"/>");
+                    setUserMessage("<spring:message code="pointLinks.pointLinkSaved"/>");
                 PointLinksDwr.getPointLink(editingPointLink.id, updatePointLink);
             }
         });
@@ -140,7 +140,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="pointLinks.pointLinks"/></span>
+                <span class="smallTitle"><spring:message code="pointLinks.pointLinks"/></span>
                 <tag:help id="pointLinks"/>
               </td>
               <td align="right"><tag:img png="link_add" title="common.add" onclick="showPointLink(${NEW_ID})"
@@ -162,7 +162,7 @@
         <div class="borderDiv">
           <table width="100%">
             <tr>
-              <td><span class="smallTitle"><fmt:message key="pointLinks.details"/></span></td>
+              <td><span class="smallTitle"><spring:message code="pointLinks.details"/></span></td>
               <td align="right">
                 <tag:img png="save" onclick="savePointLink();" title="common.save"/>
                 <tag:img id="deletePointLinkImg" png="delete" onclick="deletePointLink();" title="common.delete"/>
@@ -172,23 +172,23 @@
           
           <table>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField"><input type="text" id="xid"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="pointLinks.source"/></td>
+              <td class="formLabelRequired"><spring:message code="pointLinks.source"/></td>
               <td class="formField"><select id="sourcePointId"></select></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="pointLinks.target"/></td>
+              <td class="formLabelRequired"><spring:message code="pointLinks.target"/></td>
               <td class="formField"><select id="targetPointId"></select></td>
             </tr>
             
             <tr>
               <td class="formLabel">
-                <fmt:message key="pointLinks.script"/>
+                <spring:message code="pointLinks.script"/>
                 <tag:img png="accept" onclick="validateScript();" title="pointLinks.validate"/>
               </td>
               <td class="formField">
@@ -197,17 +197,17 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="pointLinks.event"/></td>
+              <td class="formLabelRequired"><spring:message code="pointLinks.event"/></td>
               <td class="formField">
                 <select id="event">
-                  <option value="<c:out value="<%= PointLinkVO.EVENT_CHANGE %>"/>"><fmt:message key="pointLinks.event.change"/></option>
-                  <option value="<c:out value="<%= PointLinkVO.EVENT_UPDATE %>"/>"><fmt:message key="pointLinks.event.update"/></option>
+                  <option value="<c:out value="<%= PointLinkVO.EVENT_CHANGE %>"/>"><spring:message code="pointLinks.event.change"/></option>
+                  <option value="<c:out value="<%= PointLinkVO.EVENT_UPDATE %>"/>"><spring:message code="pointLinks.event.update"/></option>
                 </select>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabel"><fmt:message key="common.disabled"/></td>
+              <td class="formLabel"><spring:message code="common.disabled"/></td>
               <td class="formField"><input type="checkbox" id="disabled"/></td>
             </tr>
           </table>
diff --git a/WebContent/WEB-INF/jsp/publicView.jsp b/WebContent/WEB-INF/jsp/publicView.jsp
index 9f7b131ac7..7bea8f63cb 100644
--- a/WebContent/WEB-INF/jsp/publicView.jsp
+++ b/WebContent/WEB-INF/jsp/publicView.jsp
@@ -21,7 +21,7 @@
 
 <html>
 <head>
-  <title><fmt:message key="header.title"/></title>
+  <title><spring:message code="header.title"/></title>
   
   <!-- Style -->
   <link rel="icon" href="images/favicon.ico"/>
diff --git a/WebContent/WEB-INF/jsp/publisherEdit.jsp b/WebContent/WEB-INF/jsp/publisherEdit.jsp
index 3381edcadd..e6d5528553 100644
--- a/WebContent/WEB-INF/jsp/publisherEdit.jsp
+++ b/WebContent/WEB-INF/jsp/publisherEdit.jsp
@@ -38,8 +38,10 @@
             for (var j = 0; j < errorMessages.length; j++) {
                 errorMessages[j].innerHTML = '';
             }
-            showMessage("message", "<fmt:message key="publisherEdit.saved"/>");
-            showHttpSenderTest();
+            showMessage("message", "<spring:message code="publisherEdit.saved"/>");
+            if (${publisher.type.id == applicationScope['constants.PublisherVO.Types.HTTP_SENDER']}) {
+                showHttpSenderTest();
+            }
         }
     }
     
@@ -68,7 +70,7 @@
       <td>
         <c:if test="${!empty publisherEvents}">
           <table class="borderDiv marB">
-            <tr><td class="smallTitle"><fmt:message key="publisherEdit.currentAlarms"/></td></tr>
+            <tr><td class="smallTitle"><spring:message code="publisherEdit.currentAlarms"/></td></tr>
             <c:forEach items="${publisherEvents}" var="event">
               <tr><td class="formError">
                 <tag:eventIcon eventBean="${event}"/>
@@ -86,12 +88,12 @@
             <tr>
               <td colspan="2" class="smallTitle">
                 <tag:img png="transmit" title="common.edit"/>
-                <fmt:message key="publisherEdit.generalProperties"/> <tag:help id="generalPublisherProperties"/>
+                <spring:message code="publisherEdit.generalProperties"/> <tag:help id="generalPublisherProperties"/>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="publisherEdit.name"/></td>
+              <td class="formLabelRequired"><spring:message code="publisherEdit.name"/></td>
               <td class="formField">
                 <input type="text" id="name" value="${publisher.name}"/>
                 <div id="nameMsg" class="formError" style="display:none;"></div>
@@ -99,7 +101,7 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField">
                 <input type="text" id="xid" value="${publisher.xid}"/>
                 <div id="xidMsg" class="formError" style="display:none;"></div>
@@ -107,12 +109,12 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.enabled"/></td>
+              <td class="formLabelRequired"><spring:message code="common.enabled"/></td>
               <td class="formField"><sst:checkbox id="enabled" selectedValue="${publisher.enabled}"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="publisherEdit.cacheWarning"/></td>
+              <td class="formLabelRequired"><spring:message code="publisherEdit.cacheWarning"/></td>
               <td class="formField">
                 <input type="text" id="cacheWarningSize" value="${publisher.cacheWarningSize}" class="formShort"/>
                 <div id="cacheWarningSizeMsg" class="formError" style="display:none;"></div>
@@ -120,23 +122,23 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="publisherEdit.updateEvent"/></td>
+              <td class="formLabelRequired"><spring:message code="publisherEdit.updateEvent"/></td>
               <td class="formField">
                 <sst:select id="changesOnly" value="${publisher.changesOnly}">
-                  <sst:option value="false"><fmt:message key="publisherEdit.updateEvent.all"/></sst:option>
-                  <sst:option value="true"><fmt:message key="publisherEdit.updateEvent.changes"/></sst:option>
+                  <sst:option value="false"><spring:message code="publisherEdit.updateEvent.all"/></sst:option>
+                  <sst:option value="true"><spring:message code="publisherEdit.updateEvent.changes"/></sst:option>
                 </sst:select>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="publisherEdit.snapshot"/></td>
+              <td class="formLabelRequired"><spring:message code="publisherEdit.snapshot"/></td>
               <td class="formField"><sst:checkbox id="sendSnapshot" onclick="sendSnapshotChanged()"
                       selectedValue="${publisher.sendSnapshot}"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="publisherEdit.snapshotPeriod"/></td>
+              <td class="formLabelRequired"><spring:message code="publisherEdit.snapshotPeriod"/></td>
               <td class="formField">
                 <input type="text" id="snapshotSendPeriods" value="${publisher.snapshotSendPeriods}" class="formShort"/>
                 <sst:select id="snapshotSendPeriodType" value="${publisher.snapshotSendPeriodType}">
@@ -168,8 +170,8 @@
     
     <tr>
       <td align="center">
-        <input type="button" value="<fmt:message key="common.save"/>" onclick="savePublisher()"/>
-        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="window.location='publishers.shtm'"/>
+        <input type="button" value="<spring:message code="common.save"/>" onclick="savePublisher()"/>
+        <input type="button" value="<spring:message code="common.cancel"/>" onclick="window.location='publishers.shtm'"/>
       </td>
     </tr>
   </table>
diff --git a/WebContent/WEB-INF/jsp/publisherEdit/editHttpSender.jsp b/WebContent/WEB-INF/jsp/publisherEdit/editHttpSender.jsp
index b53dac697f..b2d514b7c2 100644
--- a/WebContent/WEB-INF/jsp/publisherEdit/editHttpSender.jsp
+++ b/WebContent/WEB-INF/jsp/publisherEdit/editHttpSender.jsp
@@ -80,13 +80,13 @@
       var value = $get("sheaderValue");
       
       if (!key || key.trim().length == 0) {
-          alert("<fmt:message key="publisherEdit.httpSender.keyRequired"/>");
+          alert("<spring:message code="publisherEdit.httpSender.keyRequired"/>");
           return;
       }
       
       for (var i=0; i<staticHeaderList.length; i++) {
           if (staticHeaderList[i].key == key) {
-              alert("<fmt:message key="publisherEdit.httpSender.keyExists"/>: '"+ key +"'");
+              alert("<spring:message code="publisherEdit.httpSender.keyExists"/>: '"+ key +"'");
               return;
           }
       }
@@ -116,7 +116,7 @@
           dwr.util.addRows("staticHeaderList", staticHeaderList, [
                   function(data) { return data.key +"="+ data.value; },
                   function(data, options) {
-                      return "<img src='images/bullet_delete.png' class='ptr' title='<fmt:message key="publisherEdit.httpSender.removeHeader"/>' "+
+                      return "<img src='images/bullet_delete.png' class='ptr' title='<spring:message code="publisherEdit.httpSender.removeHeader"/>' "+
                               "onclick='removeStaticHeader("+ options.rowIndex + ");'/>";
                   }
                   ], null);
@@ -128,13 +128,13 @@
       var value = $get("sparamValue");
       
       if (!key || key.trim().length == 0) {
-          alert("<fmt:message key="publisherEdit.httpSender.keyRequired"/>");
+          alert("<spring:message code="publisherEdit.httpSender.keyRequired"/>");
           return;
       }
       
       for (var i=0; i<staticParameterList.length; i++) {
           if (staticParameterList[i].key == key) {
-              alert("<fmt:message key="publisherEdit.httpSender.keyExists"/>: '"+ key +"'");
+              alert("<spring:message code="publisherEdit.httpSender.keyExists"/>: '"+ key +"'");
               return;
           }
       }
@@ -160,7 +160,7 @@
           dwr.util.addRows("staticParameterList", staticParameterList, [
                   function(data) { return data.key +"="+ data.value; },
                   function(data, options) {
-                      return "<img src='images/bullet_delete.png' class='ptr' title='<fmt:message key="publisherEdit.httpSender.removeParam"/>' "+
+                      return "<img src='images/bullet_delete.png' class='ptr' title='<spring:message code="publisherEdit.httpSender.removeParam"/>' "+
                               "onclick='removeStaticParameter("+ options.rowIndex + ");'/>";
                   }
                   ], null);
@@ -289,7 +289,7 @@
   }
   
   function httpSendTest() {
-      showMessage("httpSendTestMessage", "<fmt:message key="publisherEdit.httpSender.sending"/>");
+      showMessage("httpSendTestMessage", "<spring:message code="publisherEdit.httpSender.sending"/>");
       showMessage("httpSendTestData");
       httpSendTestButtons(true);
       PublisherEditDwr.httpSenderTest(httpSendTestCB);
@@ -314,7 +314,7 @@
           if (result)
               showMessage("httpSendTestData", result);
           else
-              showMessage("httpSendTestData", "<fmt:message key="publisherEdit.httpSender.noResponseData"/>");
+              showMessage("httpSendTestData", "<spring:message code="publisherEdit.httpSender.noResponseData"/>");
           httpSendTestButtons(false);
       }
       else
@@ -327,7 +327,7 @@
   
   function httpSendTestCancelCB() {
       httpSendTestButtons(false);
-      showMessage("httpSendTestMessage", "<fmt:message key="common.cancelled"/>");
+      showMessage("httpSendTestMessage", "<spring:message code="common.cancelled"/>");
   }
 
   function removeAuthFromStaticHeaders() {
@@ -384,11 +384,11 @@
       <div class="borderDiv marR marB">
         <table>
           <tr>
-            <td colspan="2" class="smallTitle"><fmt:message key="publisherEdit.httpSender.props"/> <tag:help id="httpSenderPublishing"/></td>
+            <td colspan="2" class="smallTitle"><spring:message code="publisherEdit.httpSender.props"/> <tag:help id="httpSenderPublishing"/></td>
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.method"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.method"/></td>
             <td class="formField">
               <sst:select id="usePost" value="${publisher.usePost}">
                 <sst:option value="false">GET</sst:option>
@@ -398,12 +398,12 @@
           </tr>
 
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.useJSON"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.useJSON"/></td>
             <td class="formField"><sst:checkbox id="useJSON" /></td>
           </tr>
 
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.url"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.url"/></td>
             <td class="formField">
               <input type="text" id="url" value="${publisher.url}" class="formLong"/>
               <div id="urlMsg" class="formError" style="display:none;"></div>
@@ -411,52 +411,52 @@
           </tr>
 
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.credentials"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.credentials"/></td>
             <td class="formField">
-              <fmt:message key="publisherEdit.httpSender.username"/> <input type="text" id="username" class="formShort"/>
-              <fmt:message key="publisherEdit.httpSender.password"/> <input type="password" id="password" class="formShort"/>
+              <spring:message code="publisherEdit.httpSender.username"/> <input type="text" id="username" class="formShort"/>
+              <spring:message code="publisherEdit.httpSender.password"/> <input type="password" id="password" class="formShort"/>
             </td>
           </tr>
 
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.staticHeaders"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.staticHeaders"/></td>
             <td class="formField">
-              <fmt:message key="publisherEdit.httpSender.headerKey"/> <input type="text" id="sheaderKey" class="formShort"/>
-              <fmt:message key="publisherEdit.httpSender.headerValue"/> <input type="text" id="sheaderValue" class="formShort"/>
+              <spring:message code="publisherEdit.httpSender.headerKey"/> <input type="text" id="sheaderKey" class="formShort"/>
+              <spring:message code="publisherEdit.httpSender.headerValue"/> <input type="text" id="sheaderValue" class="formShort"/>
               <tag:img png="add" title="publisherEdit.httpSender.addStaticHeader" onclick="addStaticHeader()"/>
               <table>
-                <tr id="noStaticHeadersMsg" style="display:none"><td><fmt:message key="publisherEdit.httpSender.noStaticHeaders"/></td></tr>
+                <tr id="noStaticHeadersMsg" style="display:none"><td><spring:message code="publisherEdit.httpSender.noStaticHeaders"/></td></tr>
                 <tbody id="staticHeaderList"></tbody>
               </table>
             </td>
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.staticParams"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.staticParams"/></td>
             <td class="formField">
-              <fmt:message key="publisherEdit.httpSender.paramKey"/> <input type="text" id="sparamKey" class="formShort"/>
-              <fmt:message key="publisherEdit.httpSender.paramValue"/> <input type="text" id="sparamValue" class="formShort"/>
+              <spring:message code="publisherEdit.httpSender.paramKey"/> <input type="text" id="sparamKey" class="formShort"/>
+              <spring:message code="publisherEdit.httpSender.paramValue"/> <input type="text" id="sparamValue" class="formShort"/>
               <tag:img png="add" title="publisherEdit.httpSender.addStaticParam" onclick="addStaticParameter()"/>
               <table>
-                <tr id="noStaticParametersMsg" style="display:none"><td><fmt:message key="publisherEdit.httpSender.noStaticParams"/></td></tr>
+                <tr id="noStaticParametersMsg" style="display:none"><td><spring:message code="publisherEdit.httpSender.noStaticParams"/></td></tr>
                 <tbody id="staticParameterList"></tbody>
               </table>
             </td>
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.raiseResultWarning"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.raiseResultWarning"/></td>
             <td class="formField"><sst:checkbox id="raiseResultWarning"
                     selectedValue="${publisher.raiseResultWarning}"/></td>
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.httpSender.dateFormat"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.httpSender.dateFormat"/></td>
             <td class="formField">
               <sst:select id="dateFormat" value="${publisher.dateFormat}">
-                <sst:option value="<%= Integer.toString(HttpSenderVO.DATE_FORMAT_BASIC) %>"><fmt:message key="publisherEdit.httpSender.dateFormat.basic"/></sst:option>
-                <sst:option value="<%= Integer.toString(HttpSenderVO.DATE_FORMAT_TZ) %>"><fmt:message key="publisherEdit.httpSender.dateFormat.tz"/></sst:option>
-                <sst:option value="<%= Integer.toString(HttpSenderVO.DATE_FORMAT_UTC) %>"><fmt:message key="publisherEdit.httpSender.dateFormat.utc"/></sst:option>
+                <sst:option value="<%= Integer.toString(HttpSenderVO.DATE_FORMAT_BASIC) %>"><spring:message code="publisherEdit.httpSender.dateFormat.basic"/></sst:option>
+                <sst:option value="<%= Integer.toString(HttpSenderVO.DATE_FORMAT_TZ) %>"><spring:message code="publisherEdit.httpSender.dateFormat.tz"/></sst:option>
+                <sst:option value="<%= Integer.toString(HttpSenderVO.DATE_FORMAT_UTC) %>"><spring:message code="publisherEdit.httpSender.dateFormat.utc"/></sst:option>
               </sst:select>
             </td>
           </tr>
@@ -467,11 +467,11 @@
     <td valign="top">
       <div id="httpSenderTest" class="borderDiv marB">
         <table>
-          <tr><td class="smallTitle"><fmt:message key="publisherEdit.httpSender.sendTest"/></td></tr>
+          <tr><td class="smallTitle"><spring:message code="publisherEdit.httpSender.sendTest"/></td></tr>
           <tr>
             <td align="center">
-              <input id="httpSendTestBtn" type="button" value="<fmt:message key="publisherEdit.httpSender.sendStaticParams"/>" onclick="httpSendTest();"/>
-              <input id="httpSendTestCancelBtn" type="button" value="<fmt:message key="publisherEdit.httpSender.cancel"/>" onclick="httpSendTestCancel();"/>
+              <input id="httpSendTestBtn" type="button" value="<spring:message code="publisherEdit.httpSender.sendStaticParams"/>" onclick="httpSendTest();"/>
+              <input id="httpSendTestCancelBtn" type="button" value="<spring:message code="publisherEdit.httpSender.cancel"/>" onclick="httpSendTestCancel();"/>
             </td>
           </tr>
           <tr><td id="httpSendTestMessage" class="formError"></td></tr>
@@ -486,7 +486,7 @@
   <div class="borderDiv">
     <table width="100%">
       <tr>
-        <td class="smallTitle"><fmt:message key="publisherEdit.points"/></td>
+        <td class="smallTitle"><spring:message code="publisherEdit.points"/></td>
         <td align="right">
           <select id="availablePoints"></select>
           <tag:img png="icon_comp_add" onclick="selectPoint()"/>
@@ -496,14 +496,14 @@
     
     <table cellspacing="1" cellpadding="0">
       <tr class="rowHeader">
-        <td><fmt:message key="publisherEdit.point.name"/></td>
-        <td><fmt:message key="publisherEdit.point.status"/></td>
-        <td><fmt:message key="publisherEdit.point.type"/></td>
-        <td><fmt:message key="publisherEdit.httpSender.point.param"/></td>
-        <td><fmt:message key="publisherEdit.httpSender.point.timestamp"/></td>
+        <td><spring:message code="publisherEdit.point.name"/></td>
+        <td><spring:message code="publisherEdit.point.status"/></td>
+        <td><spring:message code="publisherEdit.point.type"/></td>
+        <td><spring:message code="publisherEdit.httpSender.point.param"/></td>
+        <td><spring:message code="publisherEdit.httpSender.point.timestamp"/></td>
         <td></td>
       </tr>
-      <tbody id="selectedPointsEmpty" style="display:none;"><tr><td colspan="5"><fmt:message key="publisherEdit.noPoints"/></td></tr></tbody>
+      <tbody id="selectedPointsEmpty" style="display:none;"><tr><td colspan="5"><spring:message code="publisherEdit.noPoints"/></td></tr></tbody>
       <tbody id="selectedPoints"></tbody>
     </table>
     <div id="pointsMsg" class="formError" style="display:none;"></div>
diff --git a/WebContent/WEB-INF/jsp/publisherEdit/editPachube.jsp b/WebContent/WEB-INF/jsp/publisherEdit/editPachube.jsp
index e632114dd6..10186fe8ec 100644
--- a/WebContent/WEB-INF/jsp/publisherEdit/editPachube.jsp
+++ b/WebContent/WEB-INF/jsp/publisherEdit/editPachube.jsp
@@ -155,11 +155,11 @@
       <div class="borderDiv marR marB">
         <table>
           <tr>
-            <td colspan="2" class="smallTitle"><fmt:message key="publisherEdit.pachube.props"/> <tag:help id="pachubePublishing"/></td>
+            <td colspan="2" class="smallTitle"><spring:message code="publisherEdit.pachube.props"/> <tag:help id="pachubePublishing"/></td>
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.pachube.apiKey"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.pachube.apiKey"/></td>
             <td class="formField">
               <input type="text" id="apiKey" value="${publisher.apiKey}" class="formLong"/>
               <div id="apiKeyMsg" class="formError" style="display:none;"></div>
@@ -167,7 +167,7 @@
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.pachube.timeoutSeconds"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.pachube.timeoutSeconds"/></td>
             <td class="formField">
               <input type="text" id="timeoutSeconds" value="${publisher.timeoutSeconds}"/>
               <div id="timeoutSecondsMsg" class="formError" style="display:none;"></div>
@@ -175,7 +175,7 @@
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.pachube.retries"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.pachube.retries"/></td>
             <td class="formField">
               <input type="text" id="retries" value="${publisher.retries}"/>
               <div id="retriesMsg" class="formError" style="display:none;"></div>
@@ -191,7 +191,7 @@
   <div class="borderDiv">
     <table width="100%">
       <tr>
-        <td class="smallTitle"><fmt:message key="publisherEdit.points"/></td>
+        <td class="smallTitle"><spring:message code="publisherEdit.points"/></td>
         <td align="right">
           <select id="availablePoints"></select>
           <tag:img png="icon_comp_add" onclick="selectPoint()"/>
@@ -201,14 +201,14 @@
     
     <table cellspacing="1" cellpadding="0">
       <tr class="rowHeader">
-        <td><fmt:message key="publisherEdit.point.name"/></td>
-        <td><fmt:message key="publisherEdit.point.status"/></td>
-        <td><fmt:message key="publisherEdit.point.type"/></td>
-        <td><fmt:message key="publisherEdit.pachube.point.feedId"/></td>
-        <td><fmt:message key="publisherEdit.pachube.point.dataStreamId"/></td>
+        <td><spring:message code="publisherEdit.point.name"/></td>
+        <td><spring:message code="publisherEdit.point.status"/></td>
+        <td><spring:message code="publisherEdit.point.type"/></td>
+        <td><spring:message code="publisherEdit.pachube.point.feedId"/></td>
+        <td><spring:message code="publisherEdit.pachube.point.dataStreamId"/></td>
         <td></td>
       </tr>
-      <tbody id="selectedPointsEmpty" style="display:none;"><tr><td colspan="5"><fmt:message key="publisherEdit.noPoints"/></td></tr></tbody>
+      <tbody id="selectedPointsEmpty" style="display:none;"><tr><td colspan="5"><spring:message code="publisherEdit.noPoints"/></td></tr></tbody>
       <tbody id="selectedPoints"></tbody>
     </table>
     <div id="pointsMsg" class="formError" style="display:none;"></div>
diff --git a/WebContent/WEB-INF/jsp/publisherEdit/editPersistent.jsp b/WebContent/WEB-INF/jsp/publisherEdit/editPersistent.jsp
index acb6f6c516..c2bf37c9a0 100644
--- a/WebContent/WEB-INF/jsp/publisherEdit/editPersistent.jsp
+++ b/WebContent/WEB-INF/jsp/publisherEdit/editPersistent.jsp
@@ -125,7 +125,7 @@
           points[points.length] = {dataPointId: selectedPoints[i].id};
       
       PublisherEditDwr.savePersistentSender(name, xid, enabled, points, $get("host"), $get("port"),
-              $get("authorizationKey"), $get("syncType"), cacheWarningSize, changesOnly, sendSnapshot, 
+              $get("authorizationKey"), xid, $get("syncType"), cacheWarningSize, changesOnly, sendSnapshot,
               snapshotSendPeriods, snapshotSendPeriodType, savePublisherCB);
   }
 </script>
@@ -136,11 +136,11 @@
       <div class="borderDiv marR marB">
         <table>
           <tr>
-            <td colspan="2" class="smallTitle"><fmt:message key="publisherEdit.persistent.props"/> <tag:help id="persistentPublishing"/></td>
+            <td colspan="2" class="smallTitle"><spring:message code="publisherEdit.persistent.props"/> <tag:help id="persistentPublishing"/></td>
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.persistent.host"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.persistent.host"/></td>
             <td class="formField">
               <input type="text" id="host" value="${publisher.host}" class="formLong"/>
               <div id="hostMsg" class="formError" style="display:none;"></div>
@@ -149,7 +149,7 @@
           
           <tr>
           
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.persistent.port"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.persistent.port"/></td>
             <td class="formField">
               <input type="text" id="port" value="${publisher.port}"/>
               <div id="portMsg" class="formError" style="display:none;"></div>
@@ -157,18 +157,18 @@
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.persistent.authorizationKey"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.persistent.authorizationKey"/></td>
             <td class="formField"><input type="text" id="authorizationKey" value="${publisher.authorizationKey}"/></td>
           </tr>
           
           <tr>
-            <td class="formLabelRequired"><fmt:message key="publisherEdit.persistent.sync"/></td>
+            <td class="formLabelRequired"><spring:message code="publisherEdit.persistent.sync"/></td>
             <td class="formField">
               <sst:select id="syncType" value="${publisher.syncType}">
-                <sst:option value="<%= Integer.toString(PersistentSenderVO.SYNC_TYPE_NONE) %>"><fmt:message key="publisherEdit.persistent.sync.none"/></sst:option>
-                <sst:option value="<%= Integer.toString(PersistentSenderVO.SYNC_TYPE_DAILY) %>"><fmt:message key="publisherEdit.persistent.sync.daily"/></sst:option>
-                <sst:option value="<%= Integer.toString(PersistentSenderVO.SYNC_TYPE_WEEKLY) %>"><fmt:message key="publisherEdit.persistent.sync.weekly"/></sst:option>
-                <sst:option value="<%= Integer.toString(PersistentSenderVO.SYNC_TYPE_MONTHLY) %>"><fmt:message key="publisherEdit.persistent.sync.monthly"/></sst:option>
+                <sst:option value="<%= Integer.toString(PersistentSenderVO.SYNC_TYPE_NONE) %>"><spring:message code="publisherEdit.persistent.sync.none"/></sst:option>
+                <sst:option value="<%= Integer.toString(PersistentSenderVO.SYNC_TYPE_DAILY) %>"><spring:message code="publisherEdit.persistent.sync.daily"/></sst:option>
+                <sst:option value="<%= Integer.toString(PersistentSenderVO.SYNC_TYPE_WEEKLY) %>"><spring:message code="publisherEdit.persistent.sync.weekly"/></sst:option>
+                <sst:option value="<%= Integer.toString(PersistentSenderVO.SYNC_TYPE_MONTHLY) %>"><spring:message code="publisherEdit.persistent.sync.monthly"/></sst:option>
               </sst:select>
             </td>
           </tr>
@@ -182,7 +182,7 @@
   <div class="borderDiv">
     <table width="100%">
       <tr>
-        <td class="smallTitle"><fmt:message key="publisherEdit.points"/></td>
+        <td class="smallTitle"><spring:message code="publisherEdit.points"/></td>
         <td align="right">
           <select id="availablePoints"></select>
           <tag:img png="icon_comp_add" onclick="selectPoint()"/>
@@ -192,12 +192,12 @@
     
     <table cellspacing="1" cellpadding="0">
       <tr class="rowHeader">
-        <td><fmt:message key="publisherEdit.point.name"/></td>
-        <td><fmt:message key="publisherEdit.point.status"/></td>
-        <td><fmt:message key="publisherEdit.point.type"/></td>
+        <td><spring:message code="publisherEdit.point.name"/></td>
+        <td><spring:message code="publisherEdit.point.status"/></td>
+        <td><spring:message code="publisherEdit.point.type"/></td>
         <td></td>
       </tr>
-      <tbody id="selectedPointsEmpty" style="display:none;"><tr><td colspan="5"><fmt:message key="publisherEdit.noPoints"/></td></tr></tbody>
+      <tbody id="selectedPointsEmpty" style="display:none;"><tr><td colspan="5"><spring:message code="publisherEdit.noPoints"/></td></tr></tbody>
       <tbody id="selectedPoints"></tbody>
     </table>
     <div id="pointsMsg" class="formError" style="display:none;"></div>
diff --git a/WebContent/WEB-INF/jsp/publisherList.jsp b/WebContent/WEB-INF/jsp/publisherList.jsp
index efc9611ac3..43246b24db 100644
--- a/WebContent/WEB-INF/jsp/publisherList.jsp
+++ b/WebContent/WEB-INF/jsp/publisherList.jsp
@@ -39,15 +39,15 @@
                 function(p) { return p.configDescription; },
                 function(p) {
                     if (p.enabled)
-                        return '<img src="images/transmit_go.png" title="<fmt:message key="common.enabledToggle"/>" '+
+                        return '<img src="images/transmit_go.png" title="<spring:message code="common.enabledToggle"/>" '+
                             'class="ptr" onclick="togglePublisher('+ p.id +')" id="pImg'+ p.id +'"/>';
-                    return '<img src="images/transmit_stop.png" title="<fmt:message key="common.disabledToggle"/>" '+
+                    return '<img src="images/transmit_stop.png" title="<spring:message code="common.disabledToggle"/>" '+
                         'class="ptr" onclick="togglePublisher('+ p.id +')" id="pImg'+ p.id +'"/>';
                 },
                 function(p) {
                     return '<a href="publisher_edit.shtm?pid='+ p.id +'"><img src="images/transmit_edit.png" '+
-                        'border="0" title="<fmt:message key="common.edit"/>"/></a> '+
-                        '<img src="images/transmit_delete.png" title="<fmt:message key="common.delete"/>" id="deleteImg'+ p.id +'" '+
+                        'border="0" title="<spring:message code="common.edit"/>"/></a> '+
+                        '<img src="images/transmit_delete.png" title="<spring:message code="common.delete"/>" id="deleteImg'+ p.id +'" '+
                         'class="ptr" onclick="deletePublisher('+ p.id +')"/>';
                 }
             ],
@@ -80,7 +80,7 @@
     
     
     function deletePublisher(id) {
-        if (confirm("<fmt:message key="publisherList.deleteConfirm"/>")) {
+        if (confirm("<spring:message code="publisherList.deleteConfirm"/>")) {
             startImageFader("deleteImg"+ id);
             PublisherListDwr.deletePublisher(id, function(publisherId) {
                 stopImageFader("deleteImg"+ publisherId);
@@ -100,7 +100,7 @@
     <tr>
       <td>
         <tag:img png="transmit" title="publisherList.publishers"/>
-        <span class="smallTitle"><fmt:message key="publisherList.publishers"/></span>
+        <span class="smallTitle"><spring:message code="publisherList.publishers"/></span>
         <tag:help id="publisherList"/>
       </td>
       <td align="right">
@@ -113,13 +113,13 @@
       <td colspan="2">
         <table cellspacing="1" cellpadding="0" border="0">
           <tr class="rowHeader">
-            <td><fmt:message key="publisherList.name"/></td>
-            <td><fmt:message key="publisherList.type"/></td>
-            <td><fmt:message key="publisherList.config"/></td>
-            <td><fmt:message key="publisherList.status"/></td>
+            <td><spring:message code="publisherList.name"/></td>
+            <td><spring:message code="publisherList.type"/></td>
+            <td><spring:message code="publisherList.config"/></td>
+            <td><spring:message code="publisherList.status"/></td>
             <td></td>
           </tr>
-          <tbody id="noPublishers" style="display:none"><tr><td colspan="5"><fmt:message key="publisherList.noRows"/></td></tr></tbody>
+          <tbody id="noPublishers" style="display:none"><tr><td colspan="5"><spring:message code="publisherList.noRows"/></td></tr></tbody>
           <tbody id="publisherList"></tbody>
         </table>
       </td>
diff --git a/WebContent/WEB-INF/jsp/reports.jsp b/WebContent/WEB-INF/jsp/reports.jsp
index bfbd9c71a1..fd92eb1666 100644
--- a/WebContent/WEB-INF/jsp/reports.jsp
+++ b/WebContent/WEB-INF/jsp/reports.jsp
@@ -24,7 +24,7 @@
 <tag:page dwr="ReportsDwr" js="emailRecipients" onload="init">
   <script type="text/javascript">
     var allPointsArray = new Array();
-    var reportPointsArray;
+    var reportPointsContext;
     var selectedReport;
     var emailRecipients;
     
@@ -34,8 +34,8 @@
             allPointsArray = response.data.points;
             
             emailRecipients = new mango.erecip.EmailRecipients("recipients",
-                    "<fmt:message key="reports.recipTestEmailMessage"/>", response.data.mailingLists, response.data.users);
-            emailRecipients.write("emailRecipBody", "emailRecipients", null, "<fmt:message key="reports.emailRecipients"/>");
+                    "<spring:message code="reports.recipTestEmailMessage"/>", response.data.mailingLists, response.data.users);
+            emailRecipients.write("emailRecipBody", "emailRecipients", null, "<spring:message code="reports.emailRecipients"/>");
             
             updateReportInstancesList(response.data.instances);
             
@@ -48,6 +48,12 @@
               ReportsDwr.createReportFromWatchlist(${param.wlid}, loadReportCB);
             </c:if>
         });
+        jQuery("#allPointsList").chosen({
+            allow_single_deselect: true,
+            placeholder_text_single: " ",
+            search_contains: true,
+            width: "400px"
+        });
     }
     
     function loadReport(reportId, copy) {
@@ -72,10 +78,9 @@
         selectedReport = report;
         
         $set("name", report.name);
-        reportPointsArray = new Array();
-        for (var i=0; i<report.points.length; i++)
-            addToReportPointsArray(report.points[i].pointId, report.points[i].colour,
-                    report.points[i].consolidatedChart);
+        let handlePointsContext = new ReportPointsContext(report.points, allPointsArray);
+        setPointsContext(handlePointsContext);
+
         $set("includeEvents", report.includeEvents);
         $set("includeUserComments", report.includeUserComments);
         $set("dateRangeType", report.dateRangeType);
@@ -110,124 +115,24 @@
         emailRecipients.updateRecipientList(report.recipients);
         
         showMessage("userMessage");
-  
-        writeReportPointsArray();
         updateDateRangeFields();
         updateScheduleFields();
         updateSchedulePeriodFields();
         updateEmailFields();
     }
-    
-    function addPointToReport() {
-        var pointId = $get("allPointsList");
-        addToReportPointsArray(pointId, "", true);
-        writeReportPointsArray();
-    }
-    
-    function addToReportPointsArray(pointId, colour, consolidatedChart) {
-        var data = getPointData(pointId);
-        if (data) {
-            // Missing names imply that the point was deleted, so ignore.
-            reportPointsArray[reportPointsArray.length] = {
-                pointId: pointId,
-                pointXid: data.xid,
-                pointName : data.name,
-                pointType : data.dataTypeMessage,
-                colour : !colour ? (!data.chartColour ? "" : data.chartColour) : colour,
-                consolidatedChart : consolidatedChart
-            };
-        }
-    }
-    
-    function getPointData(pointId) {
-        for (var i=0; i<allPointsArray.length; i++) {
-            if (allPointsArray[i].id == pointId)
-                return allPointsArray[i];
-        }
-        return null;
-    }
-    
-    function writeReportPointsArray() {
-        dwr.util.removeAllRows("reportPointsTable");
-        if (reportPointsArray.length == 0) {
-            show($("reportPointsTableEmpty"));
-            hide($("reportPointsTableHeaders"));
-        }
-        else {
-            hide($("reportPointsTableEmpty"));
-            show($("reportPointsTableHeaders"));
-            dwr.util.addRows("reportPointsTable", reportPointsArray,
-                [
-                    function(data) { return data.pointName; },
-                    function(data) { return data.pointType; },
-                    function(data) {
-                            return "<input type='text' value='"+ data.colour +"' "+
-                                    "onblur='updatePointColour("+ data.pointId +", this.value)'/>";
-                    },
-                    function(data) {
-                        return "<input type='checkbox'"+ (data.consolidatedChart ? " checked='checked'" : "") +
-                                " onclick='updatePointConsolidatedChart("+ data.pointId +", this.checked)'/>";
-                    },
-                    function(data) { 
-                            return "<img src='images/bullet_delete.png' class='ptr' "+
-                                    "onclick='removeFromReportPointsArray("+ data.pointId +")'/>";
-                    }
-                ],
-                {
-                    rowCreator:function(options) {
-                        var tr = document.createElement("tr");
-                        tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
-                        return tr;
-                    },
-                    cellCreator:function(options) {
-                        var td = document.createElement("td");
-                        if (options.cellNum == 3)
-                            td.align = "center";
-                        return td;
-                    }
-                });
-        }
-        updatePointsList();
+
+    function setPointsContext(reportPointsContext) {
+        this.reportPointsContext = reportPointsContext;
     }
     
     function updatePointColour(pointId, colour) {
-        var item = getElement(reportPointsArray, pointId, "pointId");
-        if (item)
-            item["colour"] = colour;
+        reportPointsContext.updatePoint(pointId, "colour", colour);
     }
     
     function updatePointConsolidatedChart(pointId, consolidatedChart) {
-        var item = getElement(reportPointsArray, pointId, "pointId");
-        if (item)
-            item["consolidatedChart"] = consolidatedChart;
-    }
-    
-    function updatePointsList() {
-        dwr.util.removeAllOptions("allPointsList");
-        var availPoints = new Array();
-        for (var i=0; i<allPointsArray.length; i++) {
-            var found = false;
-            for (var j=0; j<reportPointsArray.length; j++) {
-                if (reportPointsArray[j].pointId == allPointsArray[i].id) {
-                    found = true;
-                    break;
-                }
-            }
-            
-            if (!found)
-                availPoints[availPoints.length] = allPointsArray[i];
-        }
-        dwr.util.addOptions("allPointsList", availPoints, "id", "name");
-    }
-    
-    function removeFromReportPointsArray(pointId) {
-        for (var i=reportPointsArray.length-1; i>=0; i--) {
-            if (reportPointsArray[i].pointId == pointId)
-                reportPointsArray.splice(i, 1);
-        }
-        writeReportPointsArray();
+        reportPointsContext.updatePoint(pointId, "consolidatedChart", consolidatedChart);
     }
-    
+
     function updateReportInstancesList(instanceArray) {
         stopImageFader("reportInstancesRefreshImg");
         dwr.util.removeAllRows("reportInstancesList");
@@ -237,7 +142,7 @@
             hide("noReportInstances");
             dwr.util.addRows("reportInstancesList", instanceArray,
                 [
-                    function(ri) { return ri.name; },
+                    function(ri) { return "<span>" + escapeHtml(ri.name) + "</span>"; },
                     function(ri) { return ri.prettyRunStartTime; },
                     function(ri) { return ri.prettyRunDuration; },
                     function(ri) { return ri.prettyReportStartTime; },
@@ -252,18 +157,18 @@
                                 ri.state == <c:out value="<%= ReportInstance.STATE_STARTED %>"/>)
                             return "";
                             
-                        var result = "<img src='images/bullet_down.png' class='ptr' title='<fmt:message key="reports.export"/>' "+
-                                "onclick='exportData(\""+ encodeQuotes(ri.name) +"\", "+ ri.id +")'/>";
+                        var result = "<img src='images/bullet_down.png' class='ptr' title='<spring:message code="reports.export"/>' "+
+                                "onclick='exportData(\""+ escapeHtml(ri.name) +"\", "+ ri.id +")'/>";
                         
                         if (ri.includeEvents != <c:out value="<%= ReportVO.EVENTS_NONE %>"/>)
-                            result += "<img src='images/flag_white.png' class='ptr' title='<fmt:message key="reports.eventExport"/>' "+
-                                    "onclick='exportEventData(\""+ encodeQuotes(ri.name) +"\", "+ ri.id +")'/>";
+                            result += "<img src='images/flag_white.png' class='ptr' title='<spring:message code="reports.eventExport"/>' "+
+                                    "onclick='exportEventData(\""+ escapeHtml(ri.name) +"\", "+ ri.id +")'/>";
                         
                         if (ri.includeUserComments)
-                            result += "<img src='images/comment.png' class='ptr' title='<fmt:message key="reports.userCommentExport"/>' "+
-                                    "onclick='exportUserComments(\""+ encodeQuotes(ri.name) +"\", "+ ri.id +")'/>";
+                            result += "<img src='images/comment.png' class='ptr' title='<spring:message code="reports.userCommentExport"/>' "+
+                                    "onclick='exportUserComments(\""+ escapeHtml(ri.name) +"\", "+ ri.id +")'/>";
                         
-                        result += "<img src='images/icon_chart.png' class='ptr' title='<fmt:message key="reports.charts"/>' "+
+                        result += "<img src='images/icon_chart.png' class='ptr' title='<spring:message code="reports.charts"/>' "+
                                 "onclick='viewChart("+ ri.id +")'/>"+
                                 "<img id='ri"+ ri.id +"DeleteImg' src='images/bullet_delete.png' class='ptr' "+
                                 "onclick='deleteReportInstance("+ ri.id +")'/> ";
@@ -394,21 +299,9 @@
         display("emailRecipBody", email);
     }
     
-    function getReportPointIdsArray() {
-        var points = new Array();
-        for (var i=0; i<reportPointsArray.length; i++)
-            points[points.length] = {
-                pointId: reportPointsArray[i].pointId,
-                pointXid: reportPointsArray[i].pointXid,
-                colour: reportPointsArray[i].colour,
-                consolidatedChart: reportPointsArray[i].consolidatedChart
-            };
-        return points;
-    }
-    
     function saveReport() {
         startImageFader("saveImg");
-        ReportsDwr.saveReport(selectedReport.id, $get("name"), getReportPointIdsArray(), $get("includeEvents"),
+        ReportsDwr.saveReport(selectedReport.id, $get("name"), reportPointsContext.convertToSave(), $get("includeEvents"),
                 $get("includeUserComments"), $get("dateRangeType"), $get("relativeType"), $get("prevPeriodCount"),
                 $get("prevPeriodType"), $get("pastPeriodCount"), $get("pastPeriodType"), $get("fromNone"),
                 $get("fromYear"), $get("fromMonth"), $get("fromDay"), $get("fromHour"), $get("fromMinute"),
@@ -426,12 +319,12 @@
                     selectedReport.id = response.data.reportId;
                     appendReport(selectedReport.id);
                     startImageFader("r"+ selectedReport.id +"Img");
-                    showMessage("userMessage", "<fmt:message key="reports.reportAdded"/>");
+                    showMessage("userMessage", "<spring:message code="reports.reportAdded"/>");
                     show("deleteImg");
                     show("copyImg");
                 }
                 else
-                    showMessage("userMessage", "<fmt:message key="reports.reportSaved"/>");
+                    showMessage("userMessage", "<spring:message code="reports.reportSaved"/>");
                 updateReport(selectedReport.id, $get("name"));
             }
         });
@@ -443,7 +336,8 @@
     }
     
     function updateReport(id, name) {
-        $("r"+ id +"Name").innerHTML = name;
+        let escapedName = escapeHtml(name);
+        $("r"+ id +"Name").innerHTML = escapedName;
     }
     
     function clearMessages() {
@@ -478,7 +372,7 @@
         if (hasImageFader("runImg"))
             return;
         
-        ReportsDwr.runReport($get("name"), getReportPointIdsArray(), $get("includeEvents"),
+        ReportsDwr.runReport($get("name"), reportPointsContext.convertToSave(), $get("includeEvents"),
                 $get("includeUserComments"), $get("dateRangeType"), $get("relativeType"), $get("prevPeriodCount"),
                 $get("prevPeriodType"), $get("pastPeriodCount"), $get("pastPeriodType"), $get("fromNone"),
                 $get("fromYear"), $get("fromMonth"), $get("fromDay"), $get("fromHour"), $get("fromMinute"),
@@ -490,12 +384,19 @@
             if (response.hasMessages)
                 showMessages(response.messages);
             else {
-                showMessage("userMessage", "<fmt:message key="reports.reportQueued"/>");
+                showMessage("userMessage", "<spring:message code="reports.reportQueued"/>");
                 refreshReportInstanceList();
             }
         });
         startImageFader("runImg");
     }
+
+    jQuery(document).ready(function(){
+        (function($) {
+            loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
+            loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
+        })(jQuery);
+    });
   </script>
   
   <table cellpadding="0" cellspacing="0"><tr><td>
@@ -503,7 +404,7 @@
       <table width="100%">
         <tr>
           <td>
-            <span class="smallTitle"><fmt:message key="reports.reportQueue"/></span>
+            <span class="smallTitle"><spring:message code="reports.reportQueue"/></span>
             <tag:help id="reportInstances"/>
           </td>
           <td align="right">
@@ -515,17 +416,17 @@
       
       <table cellspacing="1">
         <tr class="rowHeader">
-          <td><fmt:message key="reports.reportName"/></td>
-          <td><fmt:message key="reports.runTimeStart"/></td>
-          <td><fmt:message key="reports.runDuration"/></td>
-          <td><fmt:message key="common.dateRangeFrom"/></td>
-          <td><fmt:message key="common.dateRangeTo"/></td>
-          <td><fmt:message key="reports.reportRecords"/></td>
-          <td><fmt:message key="reports.doNotPurge"/></td>
+          <td><spring:message code="reports.reportName"/></td>
+          <td><spring:message code="reports.runTimeStart"/></td>
+          <td><spring:message code="reports.runDuration"/></td>
+          <td><spring:message code="common.dateRangeFrom"/></td>
+          <td><spring:message code="common.dateRangeTo"/></td>
+          <td><spring:message code="reports.reportRecords"/></td>
+          <td><spring:message code="reports.doNotPurge"/></td>
           <td></td>
         </tr>
         <tr id="hourglass" class="row"><td colspan="8" align="center"><tag:img png="hourglass" title="reports.loading"/></td></tr>
-        <tr id="noReportInstances" class="row" style="display:none;"><td colspan="8"><fmt:message key="reports.noInstances"/></td></tr>
+        <tr id="noReportInstances" class="row" style="display:none;"><td colspan="8"><spring:message code="reports.noInstances"/></td></tr>
         <tbody id="reportInstancesList"></tbody>
       </table>
     </div>
@@ -538,7 +439,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="reports.templates"/></span>
+                <span class="smallTitle"><spring:message code="reports.templates"/></span>
                 <tag:help id="reportTemplates"/>
               </td>
               <td align="right"><tag:img png="report_add" title="reports.newReport"
@@ -561,7 +462,7 @@
             <tr>
               <td>
                 <span class="smallTitle"><tag:img id="reportImg" png="report" title="reports.report"/>
-                <fmt:message key="reports.criteria"/></span>
+                <spring:message code="reports.criteria"/></span>
               </td>
               <td align="right">
                 <tag:img id="deleteImg" png="delete" title="common.delete" onclick="deleteReport();"/>
@@ -575,7 +476,7 @@
           
           <table>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.reportName"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.reportName"/></td>
               <td class="formField">
                 <input type="text" id="name" class="formLong"/><br/>
                 <span class="formError" id="nameError"></span>
@@ -583,54 +484,55 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.points"/></td>
+              <td class="formLabelRequired"><spring:message code="common.points"/></td>
               <td class="formField">
                 <select id="allPointsList"></select>
-                <tag:img png="add" onclick="addPointToReport();" title="common.add"/>
+                <tag:img png="add" onclick="reportPointsContext.addPointToContext();" title="common.add"/>
                 
                 <table cellspacing="1">
-                  <tbody id="reportPointsTableEmpty" style="display:none;">
-                    <tr><th colspan="4"><fmt:message key="reports.noPoints"/></th></tr>
+                  <tbody id="contextTableEmpty" style="display:none;">
+                    <tr><th colspan="4"><spring:message code="reports.noPoints"/></th></tr>
                   </tbody>
-                  <tbody id="reportPointsTableHeaders" style="display:none;">
+                  <tbody id="contextTableHeaders" style="display:none;">
                     <tr class="smRowHeader">
-                      <td><fmt:message key="reports.pointName"/></td>
-                      <td><fmt:message key="reports.dataType"/></td>
-                      <td><fmt:message key="reports.colour"/></td>
-                      <td><fmt:message key="reports.consolidatedChart"/></td>
+                      <td><spring:message code="reports.pointName"/></td>
+                      <td><spring:message code="pointHierarchySLTS.xid"/></td>
+                      <td><spring:message code="reports.dataType"/></td>
+                      <td><spring:message code="reports.colour"/></td>
+                      <td><spring:message code="reports.consolidatedChart"/></td>
                       <td></td>
                     </tr>
                   </tbody>
-                  <tbody id="reportPointsTable"></tbody>
+                  <tbody id="contextTable"></tbody>
                 </table>
                 <span id="pointsError" class="formError"></span>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.events"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.events"/></td>
               <td class="formField">
                 <select id="includeEvents">
-                  <option value="<c:out value="<%= ReportVO.EVENTS_NONE %>"/>"><fmt:message key="reports.events.none"/></option>
-                  <option value="<c:out value="<%= ReportVO.EVENTS_ALARMS %>"/>"><fmt:message key="reports.events.alarms"/></option>
-                  <option value="<c:out value="<%= ReportVO.EVENTS_ALL %>"/>"><fmt:message key="reports.events.all"/></option>
+                  <option value="<c:out value="<%= ReportVO.EVENTS_NONE %>"/>"><spring:message code="reports.events.none"/></option>
+                  <option value="<c:out value="<%= ReportVO.EVENTS_ALARMS %>"/>"><spring:message code="reports.events.alarms"/></option>
+                  <option value="<c:out value="<%= ReportVO.EVENTS_ALL %>"/>"><spring:message code="reports.events.all"/></option>
                 </select>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.comments"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.comments"/></td>
               <td class="formField"><input type="checkbox" id="includeUserComments"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.dateRange"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.dateRange"/></td>
               <td class="formField">
                 <table>
                   <tr><td>
                     <input type="radio" name="dateRangeType" value="<c:out value="<%= ReportVO.DATE_RANGE_TYPE_RELATIVE %>"/>" id="drrel" 
                             checked="checked" onchange="updateDateRangeFields()"/><label 
-                            for="drrel"><fmt:message key="reports.relative"/></label>
+                            for="drrel"><spring:message code="reports.relative"/></label>
                   </td></tr>
                   <tr>
                     <td style="padding-left:40px;">
@@ -638,7 +540,7 @@
                         <tr>
                           <td valign="top"><input type="radio" name="relativeType" onchange="updateDateRangeFields()"
                                   id="relprev" value="<c:out value="<%= ReportVO.RELATIVE_DATE_TYPE_PREVIOUS %>"/>" 
-                                  checked="checked"/><label for="relprev"><fmt:message key="reports.previous"/></label></td>
+                                  checked="checked"/><label for="relprev"><spring:message code="reports.previous"/></label></td>
                           <td valign="top">
                             <input type="text" id="prevPeriodCount" class="formVeryShort"/>
                             <select id="prevPeriodType">
@@ -650,7 +552,7 @@
                         <tr>
                           <td valign="top"><input type="radio" name="relativeType" onchange="updateDateRangeFields()"
                                   id="relpast" value="<c:out value="<%= ReportVO.RELATIVE_DATE_TYPE_PAST %>"/>"/><label 
-                                  for="relpast"><fmt:message key="reports.past"/></label></td>
+                                  for="relpast"><spring:message code="reports.past"/></label></td>
                           <td valign="top">
                             <input type="text" id="pastPeriodCount" class="formVeryShort"/>
                             <select id="pastPeriodType">
@@ -665,39 +567,39 @@
                   
                   <tr><td>
                     <input type="radio" name="dateRangeType" value="<c:out value="<%= ReportVO.DATE_RANGE_TYPE_SPECIFIC %>"/>" id="drspec" 
-                            onchange="updateDateRangeFields()"/><label for="drspec"><fmt:message key="reports.specificDates"/></label>
+                            onchange="updateDateRangeFields()"/><label for="drspec"><spring:message code="reports.specificDates"/></label>
                   </td></tr>
                   <tr>
                     <td style="padding-left:40px;">
                       <table>
                         <tr>
                           <td></td>
-                          <td align="center"><fmt:message key="common.tp.year"/></td>
-                          <td align="center"><fmt:message key="common.tp.month"/></td>
-                          <td align="center"><fmt:message key="common.tp.day"/></td>
-                          <td align="center"><fmt:message key="common.tp.hour"/></td>
-                          <td align="center"><fmt:message key="common.tp.minute"/></td>
+                          <td align="center"><spring:message code="common.tp.year"/></td>
+                          <td align="center"><spring:message code="common.tp.month"/></td>
+                          <td align="center"><spring:message code="common.tp.day"/></td>
+                          <td align="center"><spring:message code="common.tp.hour"/></td>
+                          <td align="center"><spring:message code="common.tp.minute"/></td>
                           <td></td>
                         </tr>
                         <tr>
-                          <td><fmt:message key="common.dateRangeFrom"/></td>
+                          <td><spring:message code="common.dateRangeFrom"/></td>
                           <td><input type="text" id="fromYear" class="formVeryShort"/></td>
                           <td><select id="fromMonth"><tag:monthOptions/></select></td>
                           <td><select id="fromDay"><tag:dayOptions/></select></td>
                           <td><select id="fromHour"><tag:hourOptions/></select></td>
                           <td><select id="fromMinute"><tag:minuteOptions/></select></td>
                           <td><input type="checkbox" name="fromNone" id="fromNone"
-                                  onclick="updateDateRangeFields()"/><label for="fromNone"><fmt:message key="common.inception"/></label></td>
+                                  onclick="updateDateRangeFields()"/><label for="fromNone"><spring:message code="common.inception"/></label></td>
                         </tr>
                         <tr>
-                          <td><fmt:message key="common.dateRangeTo"/></td>
+                          <td><spring:message code="common.dateRangeTo"/></td>
                           <td><input type="text" id="toYear" class="formVeryShort"/></td>
                           <td><select id="toMonth"><tag:monthOptions/></select></td>
                           <td><select id="toDay"><tag:dayOptions/></select></td>
                           <td><select id="toHour"><tag:hourOptions/></select></td>
                           <td><select id="toMinute"><tag:minuteOptions/></select></td>
                           <td><input type="checkbox" name="toNone" id="toNone" 
-                                  onclick="updateDateRangeFields()"/><label for="toNone"><fmt:message key="common.latest"/></label></td>
+                                  onclick="updateDateRangeFields()"/><label for="toNone"><spring:message code="common.latest"/></label></td>
                         </tr>
                       </table>
                     </td>
@@ -709,7 +611,7 @@
             <tr><td colspan="3" class="horzSeparator"></td></tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.schedule"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.schedule"/></td>
               <td class="formField">
                 <input type="checkbox" id="schedule" onclick="updateScheduleFields();"/>
               </td>
@@ -717,21 +619,21 @@
             
             <tbody id="scheduleDetails">
               <tr>
-                <td class="formLabelRequired"><fmt:message key="reports.runEvery"/></td>
+                <td class="formLabelRequired"><spring:message code="reports.runEvery"/></td>
                 <td class="formField">
                   <table cellpadding="0" cellspacing="0">
                     <tr><td>
                       <select id="schedulePeriod" onchange="updateSchedulePeriodFields()">
                         <tag:timePeriodOptions h="true" d="true" w="true" mon="true" y="true" singular="true"/>
-                        <option value="<c:out value="<%= ReportVO.SCHEDULE_CRON %>"/>"><fmt:message key="reports.cron"/></option>
+                        <option value="<c:out value="<%= ReportVO.SCHEDULE_CRON %>"/>"><spring:message code="reports.cron"/></option>
                       </select>
                     </td></tr>
                     <tr><td style="padding-left:40px;">
-                      <fmt:message key="reports.runDelay"/>: <input type="text" id="runDelayMinutes" class="formVeryShort"/>
+                      <spring:message code="reports.runDelay"/>: <input type="text" id="runDelayMinutes" class="formVeryShort"/>
                       <div id="runDelayMinutesError" class="formError"></div>
                     </td></tr>
                     <tr><td style="padding-left:40px;">
-                      <fmt:message key="common.cronPattern"/>: <input type="text" id="scheduleCron"/>
+                      <spring:message code="common.cronPattern"/>: <input type="text" id="scheduleCron"/>
                       <tag:help id="cronPatterns"/><br/>
                       <span id="scheduleCronError" class="formError"></span>
                     </td></tr>
@@ -743,18 +645,18 @@
             <tr><td colspan="3" class="horzSeparator"></td></tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="reports.emailReport"/></td>
+              <td class="formLabelRequired"><spring:message code="reports.emailReport"/></td>
               <td class="formField"><input type="checkbox" id="email" onclick="updateEmailFields();"/></td>
             </tr>
               
             <tbody id="emailDetails">
               <tr>
-                <td class="formLabelRequired"><fmt:message key="reports.includeTabular"/></td>
+                <td class="formLabelRequired"><spring:message code="reports.includeTabular"/></td>
                 <td class="formField"><input type="checkbox" id="includeData"/></td>
               </tr>
               
               <tr>
-                <td class="formLabelRequired"><fmt:message key="reports.zipData"/></td>
+                <td class="formLabelRequired"><spring:message code="reports.zipData"/></td>
                 <td class="formField"><input type="checkbox" id="zipData"/></td>
               </tr>
             </tbody>
diff --git a/WebContent/WEB-INF/jsp/scheduledEvents.jsp b/WebContent/WEB-INF/jsp/scheduledEvents.jsp
index 37157ff7b8..11f3da220a 100644
--- a/WebContent/WEB-INF/jsp/scheduledEvents.jsp
+++ b/WebContent/WEB-INF/jsp/scheduledEvents.jsp
@@ -34,19 +34,19 @@
     }
     
     function init() {
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.mon"/>", <c:out value="<%= DateTimeConstants.MONDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.tue"/>", <c:out value="<%= DateTimeConstants.TUESDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.wed"/>", <c:out value="<%= DateTimeConstants.WEDNESDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.thu"/>", <c:out value="<%= DateTimeConstants.THURSDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.fri"/>", <c:out value="<%= DateTimeConstants.FRIDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.sat"/>", <c:out value="<%= DateTimeConstants.SATURDAY %>"/>);
-        weekdays[weekdays.length] = new OptionData("<fmt:message key="common.day.sun"/>", <c:out value="<%= DateTimeConstants.SUNDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.mon"/>", <c:out value="<%= DateTimeConstants.MONDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.tue"/>", <c:out value="<%= DateTimeConstants.TUESDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.wed"/>", <c:out value="<%= DateTimeConstants.WEDNESDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.thu"/>", <c:out value="<%= DateTimeConstants.THURSDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.fri"/>", <c:out value="<%= DateTimeConstants.FRIDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.sat"/>", <c:out value="<%= DateTimeConstants.SATURDAY %>"/>);
+        weekdays[weekdays.length] = new OptionData("<spring:message code="common.day.sun"/>", <c:out value="<%= DateTimeConstants.SUNDAY %>"/>);
         
         for (var i=1; i<29; i++)
             monthdays[monthdays.length] = new OptionData(i, i);
-        monthdays[monthdays.length] = new OptionData("<fmt:message key="common.day.thirdLast"/>", -3);
-        monthdays[monthdays.length] = new OptionData("<fmt:message key="common.day.secondLast"/>", -2);
-        monthdays[monthdays.length] = new OptionData("<fmt:message key="common.day.last"/>", -1);
+        monthdays[monthdays.length] = new OptionData("<spring:message code="common.day.thirdLast"/>", -3);
+        monthdays[monthdays.length] = new OptionData("<spring:message code="common.day.secondLast"/>", -2);
+        monthdays[monthdays.length] = new OptionData("<spring:message code="common.day.last"/>", -1);
         
         for (var i=1; i<32; i++)
             oncedays[oncedays.length] = new OptionData(i, i);
@@ -126,11 +126,11 @@
                     editingScheduledEvent.id = response.data.seId;
                     appendScheduledEvent(editingScheduledEvent.id);
                     startImageFader($("se"+ editingScheduledEvent.id +"Img"));
-                    setUserMessage("<fmt:message key="scheduledEvents.seAdded"/>");
+                    setUserMessage("<spring:message code="scheduledEvents.seAdded"/>");
                     show($("deleteScheduledEventImg"));
                 }
                 else
-                    setUserMessage("<fmt:message key="scheduledEvents.seSaved"/>");
+                    setUserMessage("<spring:message code="scheduledEvents.seSaved"/>");
                 ScheduledEventsDwr.getScheduledEvent(editingScheduledEvent.id, updateScheduledEvent)
             }
         });
@@ -310,7 +310,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="scheduledEvents.ses"/></span>
+                <span class="smallTitle"><spring:message code="scheduledEvents.ses"/></span>
                 <tag:help id="scheduledEvents"/>
               </td>
               <td align="right"><tag:img png="clock_add" title="scheduledEvents.addSe"
@@ -332,7 +332,7 @@
         <div class="borderDiv">
           <table width="100%">
             <tr>
-              <td><span class="smallTitle"><fmt:message key="scheduledEvents.seDetails"/></span></td>
+              <td><span class="smallTitle"><spring:message code="scheduledEvents.seDetails"/></span></td>
               <td align="right">
                 <tag:img png="save" onclick="saveScheduledEvent();" title="common.save"/>
                 <tag:img id="deleteScheduledEventImg" png="delete" onclick="deleteScheduledEvent();" title="common.delete"/>
@@ -342,17 +342,17 @@
           
           <table>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField"><input type="text" id="xid"/></td>
             </tr>
             
             <tr>
-              <td class="formLabel"><fmt:message key="scheduledEvents.alias"/></td>
+              <td class="formLabel"><spring:message code="scheduledEvents.alias"/></td>
               <td class="formField"><input type="text" id="alias"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.alarmLevel"/></td>
+              <td class="formLabelRequired"><spring:message code="common.alarmLevel"/></td>
               <td class="formField">
                 <select id="alarmLevel" onchange="updateAlarmLevelImage()">
                   <tag:alarmLevelOptions/>
@@ -362,35 +362,35 @@
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="scheduledEvents.type"/></td>
+              <td class="formLabelRequired"><spring:message code="scheduledEvents.type"/></td>
               <td class="formField">
                 <select id="scheduleType" onchange="refreshDateTimeFields()">
-                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_HOURLY %>"/>"><fmt:message key="scheduledEvents.type.hour"/></option>
-                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_DAILY %>"/>"><fmt:message key="scheduledEvents.type.day"/></option>
-                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_WEEKLY %>"/>"><fmt:message key="scheduledEvents.type.week"/></option>
-                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_MONTHLY %>"/>"><fmt:message key="scheduledEvents.type.month"/></option>
-                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_YEARLY %>"/>"><fmt:message key="scheduledEvents.type.year"/></option>
-                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_ONCE %>"/>"><fmt:message key="scheduledEvents.type.once"/></option>
-                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_CRON %>"/>"><fmt:message key="scheduledEvents.type.cron"/></option>
+                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_HOURLY %>"/>"><spring:message code="scheduledEvents.type.hour"/></option>
+                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_DAILY %>"/>"><spring:message code="scheduledEvents.type.day"/></option>
+                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_WEEKLY %>"/>"><spring:message code="scheduledEvents.type.week"/></option>
+                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_MONTHLY %>"/>"><spring:message code="scheduledEvents.type.month"/></option>
+                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_YEARLY %>"/>"><spring:message code="scheduledEvents.type.year"/></option>
+                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_ONCE %>"/>"><spring:message code="scheduledEvents.type.once"/></option>
+                  <option value="<c:out value="<%= ScheduledEventVO.TYPE_CRON %>"/>"><spring:message code="scheduledEvents.type.cron"/></option>
                 </select>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.rtn"/></td>
+              <td class="formLabelRequired"><spring:message code="common.rtn"/></td>
               <td class="formField"><input type="checkbox" id="rtn" onclick="refreshDateTimeFields()"/></td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.activeTime"/></td>
+              <td class="formLabelRequired"><spring:message code="common.activeTime"/></td>
               <td>
                 <table id="activeDateTable">
                   <tr>
-                    <td align="center" id="activeYearLabel"><fmt:message key="common.tp.year"/></td>
+                    <td align="center" id="activeYearLabel"><spring:message code="common.tp.year"/></td>
                     <td id="activeYearSpacer"></td>
-                    <td align="center" id="activeMonthLabel"><fmt:message key="common.tp.month"/></td>
+                    <td align="center" id="activeMonthLabel"><spring:message code="common.tp.month"/></td>
                     <td id="activeMonthSpacer"></td>
-                    <td align="center"><fmt:message key="common.tp.day"/></td>
+                    <td align="center"><spring:message code="common.tp.day"/></td>
                   </tr>
                   
                   <tr>
@@ -407,11 +407,11 @@
                 </table>
                 <table id="activeTimeTable">
                   <tr>
-                    <td align="center" id="activeHourLabel"><fmt:message key="common.tp.hour"/></td>
+                    <td align="center" id="activeHourLabel"><spring:message code="common.tp.hour"/></td>
                     <td id="activeHourSpacer"></td>
-                    <td align="center"><fmt:message key="common.tp.minute"/></td>
+                    <td align="center"><spring:message code="common.tp.minute"/></td>
                     <td></td>
-                    <td align="center"><fmt:message key="common.tp.second"/></td>
+                    <td align="center"><spring:message code="common.tp.second"/></td>
                   </tr>
                   <tr>
                     <td id="activeHourData">
@@ -440,22 +440,22 @@
                   </tr>
                 </table>
                 <table id="activeCronTable">
-                  <tr><td align="center"><fmt:message key="common.cronPattern"/></td></tr>
+                  <tr><td align="center"><spring:message code="common.cronPattern"/></td></tr>
                   <tr><td><input type="text" id="activeCron"/> <tag:help id="cronPatterns"/></td></tr>
                 </table>
               </td>
             </tr>
             
             <tr id="inactiveDateTimeRow">
-              <td class="formLabelRequired"><fmt:message key="common.inactiveTime"/></td>
+              <td class="formLabelRequired"><spring:message code="common.inactiveTime"/></td>
               <td>
                 <table id="inactiveDateTable">
                   <tr>
-                    <td align="center" id="inactiveYearLabel"><fmt:message key="common.tp.year"/></td>
+                    <td align="center" id="inactiveYearLabel"><spring:message code="common.tp.year"/></td>
                     <td id="inactiveYearSpacer"></td>
-                    <td align="center" id="inactiveMonthLabel"><fmt:message key="common.tp.month"/></td>
+                    <td align="center" id="inactiveMonthLabel"><spring:message code="common.tp.month"/></td>
                     <td id="inactiveMonthSpacer"></td>
-                    <td align="center"><fmt:message key="common.tp.day"/></td>
+                    <td align="center"><spring:message code="common.tp.day"/></td>
                   </tr>
                   <tr>
                     <td id="inactiveYearData"><input id="inactiveYear" type="text" class="formVeryShort"/></td>
@@ -471,11 +471,11 @@
                 </table>
                 <table id="inactiveTimeTable">
                   <tr>
-                    <td align="center" id="inactiveHourLabel"><fmt:message key="common.tp.hour"/></td>
+                    <td align="center" id="inactiveHourLabel"><spring:message code="common.tp.hour"/></td>
                     <td id="inactiveHourSpacer"></td>
-                    <td align="center"><fmt:message key="common.tp.minute"/></td>
+                    <td align="center"><spring:message code="common.tp.minute"/></td>
                     <td></td>
-                    <td align="center"><fmt:message key="common.tp.second"/></td>
+                    <td align="center"><spring:message code="common.tp.second"/></td>
                   </tr>
                   <tr>
                     <td id="inactiveHourData">
@@ -504,14 +504,14 @@
                   </tr>
                 </table>
                 <table id="inactiveCronTable">
-                  <tr><td align="center"><fmt:message key="common.cronPattern"/></td></tr>
+                  <tr><td align="center"><spring:message code="common.cronPattern"/></td></tr>
                   <tr><td><input type="text" id="inactiveCron"/> <tag:help id="cronPatterns"/></td></tr>
                 </table>
               </td>
             </tr>
             
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.disabled"/></td>
+              <td class="formLabelRequired"><spring:message code="common.disabled"/></td>
               <td class="formField"><input type="checkbox" id="disabled"/></td>
             </tr>
           </table>
diff --git a/WebContent/WEB-INF/jsp/scripting.jsp b/WebContent/WEB-INF/jsp/scripting.jsp
index 353587d83d..296cb89cb5 100644
--- a/WebContent/WEB-INF/jsp/scripting.jsp
+++ b/WebContent/WEB-INF/jsp/scripting.jsp
@@ -28,42 +28,35 @@
 
   <script type="text/javascript">
 
-  	var pathArray = location.href.split( '/' );
-  	var protocol = pathArray[0];
-  	var host = pathArray[2];
-  	var port = location.port;
-   	var appScada = pathArray[3];
-  	var url = protocol + '//' + host;
-  	var myLocation;
-  	if (!myLocation) {
-   		myLocation = location.protocol + "//" + location.host + "/" + appScada + "/";
-  	}
-    var urlGetDataPoints = "/api/datapoint/getAll";
+  	var myLocation = getAppLocation();
+    var urlGetDataPoints = "api/datapoint/getAll";
     function executeScript(){
     	var xid = jQuery("#xid");
     	// saveScript() nie zdarzy zapisac !!!
     	jQuery.ajax({
-    		url: myLocation+"/script/execute/"+xid[0].value,
+    		url: myLocation+"script/execute/"+xid[0].value,
     		type:"POST",
     		success: function(){
-              setUserMessage("<fmt:message key="script.execute.success"/> ")
+              setUserMessage("<spring:message code="script.execute.success"/> ")
         	},
         	error: function(XMLHttpRequest, textStatus, errorThrown) {
         		console.log(textStatus);
         		console.log(XMLHttpRequest);
-        		setUserMessage("<fmt:message key="script.execute.error"/> "+XMLHttpRequest.responseText);
+        		setUserMessage("<spring:message code="script.execute.error"/> "+XMLHttpRequest.responseText);
         	}
     	});
     };
 
     var pointsArray = new Array();
-    var contextArray = new Array();
+    var scriptPointsContext;
     var objectsContextArray = new Array();
 
     function init() {
         ScriptsDwr.getScripts(initCB);
         getPointsCB();
 
+        createContextualMessageNode("contextContainer", "context");
+
         jQuery("#allPointsList").chosen({
        		allow_single_deselect: true,
 			placeholder_text_single: " ",
@@ -110,7 +103,7 @@
     }
 
     function updateScript(se) {
-        $("se"+ se.id +"Name").innerHTML = se.name;
+        $("se"+ se.id +"Name").innerHTML = escapeHtml(se.name);
         //setScheduledEventImg(se.disabled, $("se"+ se.id +"Img"));
     }
 
@@ -125,14 +118,12 @@
                  show($("scriptDetails"));
 
             editingScript = s;
-            $set("xid", s.xid);
-            $set("name", s.name);
-            $set("script", s.script);
+            setValueInNode('xid', s.xid);
+            setValueInNode('name', s.name);
+            setValueInNode('script', s.script);
 
-            contextArray.length = 0;
-            for (var i=0; i<s.pointsOnContext.length; i++)
-                addToContextArray(s.pointsOnContext[i].key, s.pointsOnContext[i].value);
-            writeContextArray();
+            let handlePointsContext = new ScriptPointsContext(s.pointsOnContext, pointsArray);
+            setPointsContext(handlePointsContext);
 
             clearObjectsTable();
 		 	for (var i=0; i<s.objectsOnContext.length; i++)
@@ -155,16 +146,20 @@
         		 executeScript();
         	 });
         }
+    }
 
+    function setPointsContext(scriptPointsContext) {
+        this.scriptPointsContext = scriptPointsContext;
     }
 
     function saveScript() {
         ScriptsDwr.saveScript(editingScript.id,$get("xid"), $get("name"),
-                $get("script"),createContextArray(),objectsContextArray,
+                $get("script"),this.scriptPointsContext.convertToSave(),objectsContextArray,
                 function(response) {
 		        	if (response.hasMessages)
 		                showDwrMessages(response.messages);
 		            else {
+		                hideContextualMessages("scriptDetails");
 		                if (editingScript.id == ${NEW_ID}) {
 		                    stopImageFader($("se"+ editingScript.id +"Img"));
 		                    editingScript.id = response.data.seId;
@@ -176,7 +171,7 @@
 		                    	executeScript();
 		                	});
 		                }
-		                setUserMessage("<fmt:message key="scripts.saved"/>");
+		                setUserMessage("<spring:message code="scripts.saved"/>");
 		                ScriptsDwr.getScript(editingScript.id, updateScript);
 		            }
         		}
@@ -192,104 +187,6 @@
         });
     }
 
-    function addPointToContext() {
-        var pointId = $get("allPointsList");
-        addToContextArray(pointId, "p"+ pointId);
-        writeContextArray();
-    }
-
-    function addToContextArray(pointId, scriptVarName) {
-        var data = getElement(pointsArray, pointId);
-        if (data) {
-            // Missing names imply that the point was deleted, so ignore.
-            contextArray[contextArray.length] = {
-                pointId : pointId,
-                pointName : data.name,
-                pointType : data.type,
-                xid : data.xid,
-                scriptVarName : scriptVarName
-            };
-        }
-    }
-
-    function removeFromContextArray(pointId) {
-        for (var i=contextArray.length-1; i>=0; i--) {
-            if (contextArray[i].pointId == pointId)
-                contextArray.splice(i, 1);
-        }
-        writeContextArray();
-    }
-
-    function writeContextArray() {
-        dwr.util.removeAllRows("contextTable");
-        if (contextArray.length == 0) {
-            show($("contextTableEmpty"));
-            hide($("contextTableHeaders"));
-        }
-        else {
-            hide($("contextTableEmpty"));
-            show($("contextTableHeaders"));
-            dwr.util.addRows("contextTable", contextArray,
-                [
-                    function(data) { return data.pointName; },
-                    function(data) { return data.xid; },
-                    function(data) { return data.pointType; },
-                    function(data) {
-                            return "<input type='text' value='"+ data.scriptVarName +"' class='formShort' "+
-                                    "onblur='updateScriptVarName("+ data.pointId +", this.value)'/>";
-                    },
-                    function(data) {
-                            return "<img src='images/bullet_delete.png' class='ptr' "+
-                                    "onclick='removeFromContextArray("+ data.pointId +")'/>";
-                    }
-                ],
-                {
-                    rowCreator:function(options) {
-                        var tr = document.createElement("tr");
-                        tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
-                        return tr;
-                    }
-                });
-        }
-        updatePointsList();
-    }
-
-    function updatePointsList() {
-        dwr.util.removeAllOptions("allPointsList");
-        var availPoints = new Array();
-        for (var i=0; i<pointsArray.length; i++) {
-            var found = false;
-            for (var j=0; j<contextArray.length; j++) {
-                if (contextArray[j].pointId == pointsArray[i].id) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found)
-                availPoints[availPoints.length] = pointsArray[i];
-        }
-        dwr.util.addOptions("allPointsList", availPoints, "id", "name");
-        jQuery("#allPointsList").trigger('chosen:updated');
-    }
-
-    function updateScriptVarName(pointId, scriptVarName) {
-        for (var i=contextArray.length-1; i>=0; i--) {
-            if (contextArray[i].pointId == pointId)
-                contextArray[i].scriptVarName = scriptVarName;
-        }
-    }
-
-    function createContextArray() {
-        var context = new Array();
-        for (var i=0; i<contextArray.length; i++) {
-            context[context.length] = {
-                key : contextArray[i].pointId,
-                value : contextArray[i].scriptVarName
-            };
-        }
-        return context;
-    }
-
     function validateScript() {
         //alert('Not implemented!');
         //("pointProperties");
@@ -317,7 +214,7 @@
         if(checked) {
 			varName = ""+objectNameField.value;
 			if(varName == null || varName.trim().length == 0){
-				alert('<fmt:message key="scripts.objectsContext.invalidVar"/>');
+				alert('<spring:message code="scripts.objectsContext.invalidVar"/>');
 				$(objectId+"ObjectAdd").checked = false;
 				return;
 			}
@@ -375,7 +272,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="scripts.title"/></span>
+                <span class="smallTitle"><spring:message code="scripts.title"/></span>
                 <tag:help id="scripts"/>
               </td>
               <td align="right"><tag:img png="report_add" title="scripts.addSe"
@@ -397,7 +294,7 @@
         <div class="borderDiv">
           <table width="100%">
             <tr>
-              <td><span class="smallTitle"><fmt:message key="scripts.seDetails"/></span></td>
+              <td><span class="smallTitle"><spring:message code="scripts.seDetails"/></span></td>
               <td align="right">
                 <%-- <tag:img id="executeScriptImg" png="exclamation" title="common.run"/> --%>
                 <tag:img png="save" onclick="saveScript();" title="common.save"/>
@@ -408,31 +305,31 @@
 
           <table>
           	<tr>
-	            <td class="formLabelRequired"><fmt:message key="dsEdit.points.name"/></td>
+	            <td class="formLabelRequired"><spring:message code="dsEdit.points.name"/></td>
 	            <td class="formField"><input type="text" id="name"/></td>
           	</tr>
 
             <tr>
-              <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+              <td class="formLabelRequired"><spring:message code="common.xid"/></td>
               <td class="formField"><input type="text" id="xid"/></td>
             </tr>
 
             <tr>
-			    <td class="formLabelRequired"><fmt:message key="scripts.pointsContext"/></td>
+			    <td class="formLabelRequired"><spring:message code="scripts.pointsContext"/></td>
 			    <td class="formField">
 			      <select id="allPointsList"></select>
-			      <tag:img png="add" onclick="addPointToContext();" title="common.add"/>
+			      <tag:img png="add" onclick="scriptPointsContext.addPointToContext();" title="common.add"/>
 
 			      <table cellspacing="1" id="contextContainer">
 			        <tbody id="contextTableEmpty" style="display:none;">
-			          <tr><th colspan="4"><fmt:message key="dsEdit.meta.noPoints"/></th></tr>
+			          <tr><th colspan="4"><spring:message code="dsEdit.meta.noPoints"/></th></tr>
 			        </tbody>
 			        <tbody id="contextTableHeaders" style="display:none;">
 			          <tr class="smRowHeader">
-			            <td><fmt:message key="dsEdit.meta.pointName"/></td>
-			            <td><fmt:message key="pointHierarchySLTS.xid"/></td>
-			            <td><fmt:message key="dsEdit.pointDataType"/></td>
-			            <td><fmt:message key="dsEdit.meta.var"/></td>
+			            <td><spring:message code="dsEdit.meta.pointName"/></td>
+			            <td><spring:message code="pointHierarchySLTS.xid"/></td>
+			            <td><spring:message code="dsEdit.pointDataType"/></td>
+			            <td><spring:message code="dsEdit.meta.var"/></td>
 			            <td></td>
 			          </tr>
 			        </tbody>
@@ -442,21 +339,21 @@
 			</tr>
 
 			<tr>
-			    <td class="formLabelRequired"><fmt:message key="scripts.objectsContext"/></td>
+			    <td class="formLabelRequired"><spring:message code="scripts.objectsContext"/></td>
 			    <td class="formField">
 
 			      <table cellspacing="1" id="objectsContextTable">
 				      <tbody id="objectsContextTable">
 				        		<tr class="smRowHeader">
-									<td> <fmt:message key="scripts.objectsContext.name"/> </td>
-									<td> <fmt:message key="scripts.objectsContext.var"/> </td>
-									<td> <fmt:message key="scripts.objectsContext.add"/> </td>
+									<td> <spring:message code="scripts.objectsContext.name"/> </td>
+									<td> <spring:message code="scripts.objectsContext.var"/> </td>
+									<td> <spring:message code="scripts.objectsContext.add"/> </td>
 									<td> &nbsp; </td>
 								</tr>
 				        		<c:forEach var="object" items="<%=br.org.scadabr.rt.scripting.context.ScriptContextObject.Type.values()%>">
 								<tr style="width: 100%;" class="smRow">
 									<td title="${object.id}" style="display: none;"> </td>
-									<td> <fmt:message key="${object.key}"/>  </td>
+									<td> <spring:message code="${object.key}"/>  </td>
 									<td> <input id="${object.id}ObjectVarName" type="text" value="var_${object.id}"/> </td>
 									<td> <input id="${object.id}ObjectAdd" type="checkbox" onchange="addObjectToContext(${object.id}, this.checked)"/> </td>
 									<td> <tag:help id="${object.help}"/> </td>
@@ -470,7 +367,7 @@
             <tr>
 
     			<td class="formLabelRequired">
-      				<fmt:message key="dsEdit.meta.script"/>
+      				<spring:message code="dsEdit.meta.script"/>
 
       				<tag:img id="executeScriptImg" png="cog_go" title="common.run"/>
       				<%-- <tag:img png="accept" onclick="validateScript();" title="dsEdit.meta.validate"/> --%>
diff --git a/WebContent/WEB-INF/jsp/sql.jsp b/WebContent/WEB-INF/jsp/sql.jsp
index 3f1831b681..a4b99f5c3b 100644
--- a/WebContent/WEB-INF/jsp/sql.jsp
+++ b/WebContent/WEB-INF/jsp/sql.jsp
@@ -31,12 +31,12 @@
         <form action="sql.shtm" method="post">
           <table>
             <tr>
-              <td colspan="2"><fmt:message key="sql.warning"/></td>
+              <td colspan="2"><span class="formError"><spring:message code="sql.warning.prefix"/></span> <spring:message code="sql.warning"/></td>
             </tr>
             <spring:bind path="form.sqlString">
               <tr>
                 <td class="formLabelRequired">
-                  <fmt:message key="sql.sql"/>
+                  <spring:message code="sql.sql"/>
                   <tag:help id="directQuerying"/>
                 </td>
                 <td><textarea id="sqlString" name="sqlString" rows="8" cols="80"><c:out value="${status.value}"/></textarea></td>
@@ -48,7 +48,7 @@
             
             <tr>
               <td colspan="2" align="center">
-                <input type="submit" value="<fmt:message key="sql.query"/>" name="query"/>
+                <input type="submit" value="<spring:message code="sql.query"/>" name="query"/>
               </td>
               <td></td>
             </tr>
@@ -75,7 +75,7 @@
         </c:if>
 
         <c:if test="${form.updateResult > -1}">
-          ${form.updateResult} <fmt:message key="sql.rowsUpdated"/>
+          ${form.updateResult} <spring:message code="sql.rowsUpdated"/>
         </c:if>
 
         <br/>
diff --git a/WebContent/WEB-INF/jsp/systemSettings.jsp b/WebContent/WEB-INF/jsp/systemSettings.jsp
index 0f61a006c9..9bc97c93be 100644
--- a/WebContent/WEB-INF/jsp/systemSettings.jsp
+++ b/WebContent/WEB-INF/jsp/systemSettings.jsp
@@ -33,7 +33,7 @@
   <script type="text/javascript">
     var systemEventAlarmLevels = new Array();
     var auditEventAlarmLevels = new Array();
-    
+
     function init() {
         SystemSettingsDwr.getSettings(function(settings) {
             $set("<c:out value="<%= SystemSettingsDAO.EMAIL_SMTP_HOST %>"/>", settings.<c:out value="<%= SystemSettingsDAO.EMAIL_SMTP_HOST %>"/>);
@@ -53,11 +53,11 @@
                     var etid = et.typeId +"-"+ et.typeRef1;
                     var content = "<select id='alarmLevel"+ etid +"' ";
                     content += "onchange='updateAlarmLevel("+ et.typeId +", "+ et.typeRef1 +", this.value)'>";
-                    content += "<option value='<c:out value="<%= AlarmLevels.NONE %>"/>'><fmt:message key="<%= AlarmLevels.NONE_DESCRIPTION %>"/></option>";
-                    content += "<option value='<c:out value="<%= AlarmLevels.INFORMATION %>"/>'><fmt:message key="<%= AlarmLevels.INFORMATION_DESCRIPTION %>"/></option>";
-                    content += "<option value='<c:out value="<%= AlarmLevels.URGENT %>"/>'><fmt:message key="<%= AlarmLevels.URGENT_DESCRIPTION %>"/></option>";
-                    content += "<option value='<c:out value="<%= AlarmLevels.CRITICAL %>"/>'><fmt:message key="<%= AlarmLevels.CRITICAL_DESCRIPTION %>"/></option>";
-                    content += "<option value='<c:out value="<%= AlarmLevels.LIFE_SAFETY %>"/>'><fmt:message key="<%= AlarmLevels.LIFE_SAFETY_DESCRIPTION %>"/></option>";
+                    content += "<option value='<c:out value="<%= AlarmLevels.NONE %>"/>'><spring:message code="<%= AlarmLevels.NONE_DESCRIPTION %>"/></option>";
+                    content += "<option value='<c:out value="<%= AlarmLevels.INFORMATION %>"/>'><spring:message code="<%= AlarmLevels.INFORMATION_DESCRIPTION %>"/></option>";
+                    content += "<option value='<c:out value="<%= AlarmLevels.URGENT %>"/>'><spring:message code="<%= AlarmLevels.URGENT_DESCRIPTION %>"/></option>";
+                    content += "<option value='<c:out value="<%= AlarmLevels.CRITICAL %>"/>'><spring:message code="<%= AlarmLevels.CRITICAL_DESCRIPTION %>"/></option>";
+                    content += "<option value='<c:out value="<%= AlarmLevels.LIFE_SAFETY %>"/>'><spring:message code="<%= AlarmLevels.LIFE_SAFETY_DESCRIPTION %>"/></option>";
                     content += "</select> ";
                     content += "<img id='alarmLevelImg"+ etid +"' src='images/flag_green.png' style='display:none'>";
                     return content;
@@ -109,14 +109,19 @@
             $set("<c:out value="<%= SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH %>"/>", settings.<c:out value="<%= SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH %>"/>);
             $set("<c:out value="<%= SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH %>"/>", settings.<c:out value="<%= SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH %>"/>);
 
+
             setDisabled($("<c:out value="<%= SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_ENABLED %>"/>"), !settings.<c:out value="<%= SystemSettingsDAO.WORK_ITEMS_REPORTING_ENABLED %>"/>);
             setDisabled($("<c:out value="<%= SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT %>"/>"), !settings.<c:out value="<%= SystemSettingsDAO.WORK_ITEMS_REPORTING_ENABLED %>"/> || !settings.<c:out value="<%= SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_ENABLED %>"/>);
 
+            $set("<c:out value="<%= SystemSettingsDAO.EVENT_ASSIGN_ENABLED %>"/>", settings.<c:out value="<%= SystemSettingsDAO.EVENT_ASSIGN_ENABLED %>"/>);
             var sel = $("<c:out value="<%= SystemSettingsDAO.LANGUAGE %>"/>");
             <c:forEach items="${availableLanguages}" var="lang">
               sel.options[sel.options.length] = new Option("${lang.value}", "${lang.key}");
             </c:forEach>
             $set(sel, settings.<c:out value="<%= SystemSettingsDAO.LANGUAGE %>"/>);
+          $set("<c:out value="<%= SystemSettingsDAO.TOP_DESCRIPTION_PREFIX %>"/>", settings.<c:out value="<%= SystemSettingsDAO.TOP_DESCRIPTION_PREFIX %>"/>);
+          $set("<c:out value="<%= SystemSettingsDAO.TOP_DESCRIPTION %>"/>", settings.<c:out value="<%= SystemSettingsDAO.TOP_DESCRIPTION %>"/>);
+          $set("<c:out value="<%= SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT %>"/>", settings.<c:out value="<%= SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT %>"/>);
         });
 
 <%--
@@ -148,7 +153,7 @@
     }
     
     function dbSizeUpdate() {
-        $set("databaseSize", "<fmt:message key="systemSettings.retrieving"/>");
+        $set("databaseSize", "<spring:message code="systemSettings.retrieving"/>");
         $set("filedataSize", "-");
         $set("totalSize", "-");
         $set("historyCount", "-");
@@ -157,7 +162,7 @@
         hide("refreshImg");
         SystemSettingsDwr.getDatabaseSize(function(data) {
             $set("databaseSize", data.databaseSize);
-            $set("filedataSize", data.filedataSize +" ("+ data.filedataCount +" <fmt:message key="systemSettings.files"/>)");
+            $set("filedataSize", data.filedataSize +" ("+ data.filedataCount +" <spring:message code="systemSettings.files"/>)");
             $set("totalSize", data.totalSize);
             $set("historyCount", data.historyCount);
             show("refreshImg");
@@ -187,7 +192,7 @@
             $get("<c:out value="<%= SystemSettingsDAO.EMAIL_CONTENT_TYPE %>"/>"),
             function() {
                 stopImageFader("saveEmailSettingsImg");
-                setUserMessage("emailMessage", "<fmt:message key="systemSettings.emailSettingsSaved"/>");
+                setUserMessage("emailMessage", "<spring:message code="systemSettings.emailSettingsSaved"/>");
             });
         setUserMessage("emailMessage");
         startImageFader("saveEmailSettingsImg");
@@ -228,7 +233,7 @@
     function saveSystemEventAlarmLevels() {
         SystemSettingsDwr.saveSystemEventAlarmLevels(systemEventAlarmLevels, function() {
                 stopImageFader("saveSystemEventAlarmLevelsImg");
-                setUserMessage("systemEventAlarmLevelsMessage", "<fmt:message key="systemSettings.systemAlarmLevelsSaved"/>");
+                setUserMessage("systemEventAlarmLevelsMessage", "<spring:message code="systemSettings.systemAlarmLevelsSaved"/>");
         });
         setUserMessage("systemEventAlarmLevelsMessage");
         startImageFader("saveSystemEventAlarmLevelsImg");
@@ -237,7 +242,7 @@
     function saveAuditEventAlarmLevels() {
         SystemSettingsDwr.saveAuditEventAlarmLevels(auditEventAlarmLevels, function() {
                 stopImageFader("saveAuditEventAlarmLevelsImg");
-                setUserMessage("auditEventAlarmLevelsMessage", "<fmt:message key="systemSettings.auditAlarmLevelsSaved"/>");
+                setUserMessage("auditEventAlarmLevelsMessage", "<spring:message code="systemSettings.auditAlarmLevelsSaved"/>");
         });
         setUserMessage("auditEventAlarmLevelsMessage");
         startImageFader("saveAuditEventAlarmLevelsImg");
@@ -262,7 +267,7 @@
                     if(a.messages && a.messages.length > 0) {
                         setUserMessage("httpMessage", a.messages[0].contextualMessage);
                     } else {
-                        setUserMessage("httpMessage", "<fmt:message key="systemSettings.httpSaved"/>");
+                        setUserMessage("httpMessage", "<spring:message code="systemSettings.httpSaved"/>");
                     }
                 });
         setUserMessage("httpMessage");
@@ -308,15 +313,18 @@
                 $get("<c:out value="<%= SystemSettingsDAO.THREADS_NAME_ADDITIONAL_LENGTH %>"/>"),
                 $get("<c:out value="<%= SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH %>"/>"),
                 $get("<c:out value="<%= SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH %>"/>"),
+                $get("<c:out value="<%= SystemSettingsDAO.EVENT_ASSIGN_ENABLED %>"/>"),
+                $get("<c:out value="<%= SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT %>"/>"),
                 function(response) {
                     stopImageFader("saveMiscSettingsImg");
                     if (response.hasMessages)
-                        setUserMessage("miscMessage", response.messages[0].contextualMessage);
+                        showDwrMessages(response.messages);
                     else {
-                        setUserMessage("miscMessage", "<fmt:message key="systemSettings.miscSaved"/>");
+                        setUserMessage("miscMessage", "<spring:message code="systemSettings.miscSaved"/>");
                     }
                 });
         setUserMessage("miscMessage");
+        hideContextualMessages("settingsMisc");
         startImageFader("saveMiscSettingsImg");
     }
 
@@ -331,7 +339,7 @@
                     $get("<c:out value="<%= SystemSettingsDAO.FUTURE_DATE_LIMIT_PERIODS %>"/>"),
                     function() {
                         stopImageFader("saveDataRetentionSettingsImg");
-                        setUserMessage("dataRetentionMessage", "<fmt:message key="systemSettings.dataRetentionSaved"/>");
+                        setUserMessage("dataRetentionMessage", "<spring:message code="systemSettings.dataRetentionSaved"/>");
                     });
             setUserMessage("dataRetentionMessage");
             startImageFader("saveDataRetentionSettingsImg");
@@ -343,15 +351,23 @@
         else
             $set(type, "");
     }
-    
+
     function saveInfoSettings() {
+        var topDescriptionPrefix = $get("<c:out value="<%= SystemSettingsDAO.TOP_DESCRIPTION_PREFIX %>"/>");
+        var topDescription = $get("<c:out value="<%= SystemSettingsDAO.TOP_DESCRIPTION %>"/>");
+
         SystemSettingsDwr.saveInfoSettings("0",
-                //$get("<c:out value="<%= SystemSettingsDAO.NEW_VERSION_NOTIFICATION_LEVEL %>"/>"),
-                $get("<c:out value="<%= SystemSettingsDAO.INSTANCE_DESCRIPTION %>"/>"),
-                function() {
-                    stopImageFader("saveInfoSettingsImg");
-                    setUserMessage("infoMessage", "<fmt:message key="systemSettings.infoSaved"/>");
-                });
+            $get("<c:out value="<%= SystemSettingsDAO.INSTANCE_DESCRIPTION %>"/>"),
+            topDescriptionPrefix,
+            topDescription,
+            function() {
+                stopImageFader("saveInfoSettingsImg");
+                document.getElementById('top-description-prefix').innerText = topDescriptionPrefix;
+                document.getElementById('top-description').innerText = topDescription;
+                setUserMessage("infoMessage", "<spring:message code='systemSettings.infoSaved'/>");
+            }
+        );
+
         setUserMessage("infoMessage");
         startImageFader("saveInfoSettingsImg");
     }
@@ -360,14 +376,14 @@
         SystemSettingsDwr.newVersionCheck($get("<c:out value="<%= SystemSettingsDAO.NEW_VERSION_NOTIFICATION_LEVEL %>"/>"),
                 function(result) {
                     if (!result)
-                        result = "<fmt:message key="systemSettings.upToDate"/>";
+                        result = "<spring:message code="systemSettings.upToDate"/>";
                     alert(result);
                 }
         );
     }
     
     function purgeNow() {
-        if (confirm("<fmt:message key="systemSettings.purgeDataPointStrategyConfirm"/>")) {
+        if (confirm("<spring:message code="systemSettings.purgeDataPointStrategyConfirm"/>")) {
             SystemSettingsDwr.purgeNow(function() {
                 stopImageFader("purgeNowImg");
                 dbSizeUpdate();
@@ -379,15 +395,15 @@
     function saveLangSettings() {
         SystemSettingsDwr.saveLanguageSettings($get("<c:out value="<%= SystemSettingsDAO.LANGUAGE %>"/>"), function() {
             stopImageFader("saveLangSettingsImg");
-            setUserMessage("langMessage", "<fmt:message key="systemSettings.langSaved"/>");
+            setUserMessage("langMessage", "<spring:message code="systemSettings.langSaved"/>");
         });
         setUserMessage("langMessage");
         startImageFader("saveLangSettingsImg");
     }
     
     function checkPurgeAllData() {
-        if (confirm("<fmt:message key="systemSettings.purgeDataConfirm"/>")) {
-            setUserMessage("dataRetentionMessage", "<fmt:message key="systemSettings.purgeDataInProgress"/>");
+        if (confirm("<spring:message code="systemSettings.purgeDataConfirm"/>")) {
+            setUserMessage("dataRetentionMessage", "<spring:message code="systemSettings.purgeDataInProgress"/>");
             SystemSettingsDwr.purgeAllData(function(msg) {
                 setUserMessage("dataRetentionMessage", msg);
                 dbSizeUpdate();
@@ -432,7 +448,7 @@
     function useDerbyDB() {
     	SystemSettingsDwr.useDerbyDB();
 		SystemSettingsDwr.getAppServer(function(msg){
-    		alert("<fmt:message key="systemSettings.reServer"/>" + " - " + msg);
+    		alert("<spring:message code="systemSettings.reServer"/>" + " - " + msg);
 		});
 		
     }
@@ -440,14 +456,14 @@
     function useMysqlDB() {
     	SystemSettingsDwr.useMysqlDB();
     	SystemSettingsDwr.getAppServer(function(msg){
-    		alert("<fmt:message key="systemSettings.reServer"/>" + " - " + msg);
+    		alert("<spring:message code="systemSettings.reServer"/>" + " - " + msg);
 		});
     }
     
     function useMssqlDB() {
     	SystemSettingsDwr.useMssqlDB();
     	SystemSettingsDwr.getAppServer(function(msg){
-    		alert("<fmt:message key="systemSettings.reServer"/>" + " - " + msg);
+    		alert("<spring:message code="systemSettings.reServer"/>" + " - " + msg);
 		});
     }
     
@@ -469,7 +485,7 @@
         jQuery.ajax({
             type: 'GET',
             dataType: 'text',
-            url:myLocation+"/api/resources/imagesRefresh",
+            url:myLocation+"api/resources/imagesRefresh",
             success: function(msg){
                 alert("Success: the resource images has been refreshed");
             },
@@ -494,15 +510,11 @@
       dialog.style.display = 'none';
     }
 
-    function saveCssSettings() {
-      hideCssDialog();
-      saveCustomCssConfig();
-    }
-
     function initCustomCssData() {
       fetchCustomCssConfig().then((val) => {
-        document.getElementById('cssEditor').value = val;
-        updateCodeText(val, '#cssHighlightingContent');
+        let res = JSON.parse(val);
+        document.getElementById('cssEditor').innerHTML = res.content;
+        updateCodeTextEscaped(res.content, '#cssHighlightingContent');
       });
     }
 
@@ -512,7 +524,7 @@
         req.open('GET', customCssUrl, true);
         req.onload = () => {
           if (req.status === 200) {
-            resolve(req.responseText);
+            resolve(req.response);
           } else {
             reject(req.status);
           }
@@ -528,10 +540,18 @@
       return new Promise((resolve, reject) => {
         let req = new XMLHttpRequest();
         req.open('POST', customCssUrl, true);
-        req.setRequestHeader('Content-type', 'application/text');
+        req.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
+        setUserMessage("customCssMessage");
         req.onload = () => {
           if (req.status === 200) {
             resolve(req.responseText);
+            setUserMessage("customCssMessage", "<spring:message code="systemSettings.customCssSaved"/>");
+          } else if (req.status === 400) {
+            let errors = JSON.parse(req.responseText);
+            if(errors.length > 0) {
+              setUserMessage("customCssMessage", "<spring:message code="systemSettings.invalidCustomCss"/>");
+            }
+            reject(errors);
           } else {
             reject(req.status);
           }
@@ -539,7 +559,12 @@
         req.onerror = () => {
           reject(req.status);
         }
-        req.send(document.getElementById('cssEditor').value);
+        let cssContent = document.getElementById('cssEditor').value;
+        let cssStyle = {
+            content: cssContent
+        };
+        let body = JSON.stringify(cssStyle);
+        req.send(body);
       });
     }
 
@@ -550,41 +575,58 @@
         }
         $set("<c:out value="<%= SystemSettingsDAO.UI_PERFORMANCE %>"/>", uiPerformance);
     }
+
+    document.addEventListener('DOMContentLoaded', () => {
+      const cssEditor = document.getElementById('cssEditor');
+      const cssHighlighting = document.getElementById('cssHighlighting');
+      if (cssEditor && cssHighlighting) {
+        cssEditor.addEventListener('input', () => {
+          updateCodeText(cssEditor.value, '#cssHighlightingContent');
+        });
+        cssEditor.addEventListener('scroll', () => {
+          syncCodeScroll(cssEditor, '#cssHighlighting');
+        });
+      }
+    });
+
   </script>
   
   <div class="borderDivPadded marB marR" style="float:left">
     <table width="100%">
       <tr>
         <td>
-          <span class="smallTitle"><fmt:message key="systemSettings.systemInformation"/></span>
+          <span class="smallTitle"><spring:message code="systemSettings.systemInformation"/></span>
           <tag:help id="systemInformation"/>
         </td>
+        <td align="right">
+          <tag:img id="saveInfoSettingsImg" png="save" onclick="saveInfoSettings();" title="common.save"/>
+        </td>
       </tr>
     </table>
     <table>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.version"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.version"/></td>
         <td class="formField"><c:out value="<%= Common.getVersion() %>"/></td>
       </tr>
       <%-- 
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.notify"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.notify"/></td>
         <td class="formField" valign="top">
           <select id="<c:out value="<%= SystemSettingsDAO.NEW_VERSION_NOTIFICATION_LEVEL %>"/>">
-            <option value="<c:out value="<%= SystemSettingsDAO.NOTIFICATION_LEVEL_STABLE %>"/>"><fmt:message key="systemSettings.notifyStable"/></option>
-            <option value="<c:out value="<%= SystemSettingsDAO.NOTIFICATION_LEVEL_RC %>"/>"><fmt:message key="systemSettings.notifyRC"/></option>
-            <option value="<c:out value="<%= SystemSettingsDAO.NOTIFICATION_LEVEL_BETA %>"/>"><fmt:message key="systemSettings.notifyBeta"/></option>
+            <option value="<c:out value="<%= SystemSettingsDAO.NOTIFICATION_LEVEL_STABLE %>"/>"><spring:message code="systemSettings.notifyStable"/></option>
+            <option value="<c:out value="<%= SystemSettingsDAO.NOTIFICATION_LEVEL_RC %>"/>"><spring:message code="systemSettings.notifyRC"/></option>
+            <option value="<c:out value="<%= SystemSettingsDAO.NOTIFICATION_LEVEL_BETA %>"/>"><spring:message code="systemSettings.notifyBeta"/></option>
           </select>
           <tag:img png="accept" title="systemSettings.checkNow" onclick="newVersionCheck()"/>
         </td>
       </tr>
       --%>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.instanceDescription"/></td>
-        <td align="center"><input type="button" value="<fmt:message key="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#system-info-settings'"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.instanceDescription"/></td>
+        <td align="center"><input type="button" value="<spring:message code="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#system-info-settings'"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.databaseSize"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.databaseSize"/></td>
         <td class="formField">
           <span id="databaseSize"></span>
           <tag:img id="refreshImg" png="control_repeat_blue" onclick="dbSizeUpdate();" title="common.refresh"/>
@@ -592,25 +634,37 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.filedataSize"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.filedataSize"/></td>
         <td class="formField" id="filedataSize"></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.totalSize"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.totalSize"/></td>
         <td class="formField" id="totalSize"></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.historyCount"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.historyCount"/></td>
         <td class="formField" id="historyCount"></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.topPoints"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.topPoints"/></td>
         <td class="formField" id="topPoints"></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.eventCount"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.eventCount"/></td>
         <td class="formField" id="eventCount"></td>
       </tr>
+      <tr>
+        <td class="formLabelRequired"><spring:message code="systemsettings.top.description.prefix"/></td>
+        <td class="formField">
+          <input id="<c:out value="<%= SystemSettingsDAO.TOP_DESCRIPTION_PREFIX %>"/>" type="text" class="formShort" style="width: 150px"/>
+        </td>
+      </tr>
+      <tr>
+        <td class="formLabelRequired"><spring:message code="systemsettings.top.description"/></td>
+        <td class="formField">
+          <input id="<c:out value="<%= SystemSettingsDAO.TOP_DESCRIPTION %>"/>" type="text" class="formShort" style="width: 150px"/>
+        </td>
+      </tr>
       <tr>
         <td colspan="2" id="infoMessage" class="formError"></td>
       </tr>
@@ -621,7 +675,7 @@
     <table width="100%">
       <tr>
         <td>
-          <span class="smallTitle"><fmt:message key="systemSettings.systemAlarmLevels"/></span>
+          <span class="smallTitle"><spring:message code="systemSettings.systemAlarmLevels"/></span>
           <tag:help id="systemAlarmLevels"/>
         </td>
         <td align="right">
@@ -642,7 +696,7 @@
     <table width="100%">
       <tr>
         <td>
-          <span class="smallTitle"><fmt:message key="systemSettings.auditAlarmLevels"/></span>
+          <span class="smallTitle"><spring:message code="systemSettings.auditAlarmLevels"/></span>
           <tag:help id="auditAlarmLevels"/>
         </td>
         <td align="right">
@@ -663,7 +717,7 @@
     <table width="100%">
       <tr>
         <td>
-          <span class="smallTitle"><fmt:message key="systemSettings.languageSettings"/></span>
+          <span class="smallTitle"><spring:message code="systemSettings.languageSettings"/></span>
           <tag:help id="languageSettings"/>
         </td>
         <td align="right">
@@ -674,7 +728,7 @@
 
     <table>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.systemLanguage"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.systemLanguage"/></td>
         <td class="formField">
           <select id="<c:out value="<%= SystemSettingsDAO.LANGUAGE %>"/>"></select>
         </td>
@@ -688,7 +742,7 @@
     <table width="100%">
       <tr>
         <td>
-          <span class="smallTitle"><fmt:message key="systemSettings.emailSettings"/></span>
+          <span class="smallTitle"><spring:message code="systemSettings.emailSettings"/></span>
           <tag:help id="emailSettings"/>
         </td>
         <td align="right">
@@ -699,46 +753,46 @@
     </table>
     <table>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.smtpHost"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.smtpHost"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.EMAIL_SMTP_HOST %>"/>" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.smtpPort"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.smtpPort"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.EMAIL_SMTP_PORT %>"/>" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.fromAddress"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.fromAddress"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.EMAIL_FROM_ADDRESS %>"/>" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="systemSettings.fromName"/></td>
+        <td class="formLabel"><spring:message code="systemSettings.fromName"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.EMAIL_FROM_NAME %>"/>" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.auth"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.auth"/></td>
         <td class="formField">
           <input id="<c:out value="<%= SystemSettingsDAO.EMAIL_AUTHORIZATION %>"/>" type="checkbox" onclick="smtpAuthChange()"/>
         </td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="systemSettings.smtpUsername"/></td>
+        <td class="formLabel"><spring:message code="systemSettings.smtpUsername"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.EMAIL_SMTP_USERNAME %>"/>" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="systemSettings.smtpPassword"/></td>
+        <td class="formLabel"><spring:message code="systemSettings.smtpPassword"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.EMAIL_SMTP_PASSWORD %>"/>" type="password"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.tls"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.tls"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.EMAIL_TLS %>"/>" type="checkbox"/></td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.contentType"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.contentType"/></td>
         <td class="formField">
           <select id="<c:out value="<%= SystemSettingsDAO.EMAIL_CONTENT_TYPE %>"/>">
-            <option value="<c:out value="<%= MangoEmailContent.CONTENT_TYPE_BOTH %>"/>"><fmt:message key="systemSettings.contentType.both"/></option>
-            <option value="<c:out value="<%= MangoEmailContent.CONTENT_TYPE_HTML %>"/>"><fmt:message key="systemSettings.contentType.html"/></option>
-            <option value="<c:out value="<%= MangoEmailContent.CONTENT_TYPE_TEXT %>"/>"><fmt:message key="systemSettings.contentType.text"/></option>
+            <option value="<c:out value="<%= MangoEmailContent.CONTENT_TYPE_BOTH %>"/>"><spring:message code="systemSettings.contentType.both"/></option>
+            <option value="<c:out value="<%= MangoEmailContent.CONTENT_TYPE_HTML %>"/>"><spring:message code="systemSettings.contentType.html"/></option>
+            <option value="<c:out value="<%= MangoEmailContent.CONTENT_TYPE_TEXT %>"/>"><spring:message code="systemSettings.contentType.text"/></option>
           </select>
         </td>
       </tr>
@@ -753,7 +807,7 @@
     <table width="100%">
       <tr>
         <td>
-          <span class="smallTitle"><fmt:message key="systemSettings.httpSettings"/></span>
+          <span class="smallTitle"><spring:message code="systemSettings.httpSettings"/></span>
           <tag:help id="httpSettings"/>
         </td>
         <td align="right">
@@ -763,33 +817,33 @@
     </table>
     <table>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.useProxy"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.useProxy"/></td>
         <td class="formField">
           <input id="<c:out value="<%= SystemSettingsDAO.HTTP_CLIENT_USE_PROXY %>"/>" type="checkbox"
                   onclick="httpUseProxyChange()"/>
         </td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="systemSettings.proxyHost"/></td>
+        <td class="formLabel"><spring:message code="systemSettings.proxyHost"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.HTTP_CLIENT_PROXY_SERVER %>"/>" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="systemSettings.proxyPort"/></td>
+        <td class="formLabel"><spring:message code="systemSettings.proxyPort"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.HTTP_CLIENT_PROXY_PORT %>"/>" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="systemSettings.proxyUsername"/></td>
+        <td class="formLabel"><spring:message code="systemSettings.proxyUsername"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.HTTP_CLIENT_PROXY_USERNAME %>"/>" type="text"/></td>
       </tr>
       <tr>
-        <td class="formLabel"><fmt:message key="systemSettings.proxyPassword"/></td>
+        <td class="formLabel"><spring:message code="systemSettings.proxyPassword"/></td>
         <td class="formField"><input id="<c:out value="<%= SystemSettingsDAO.HTTP_CLIENT_PROXY_PASSWORD %>"/>" type="password"/></td>
       </tr>
       <tr>
-        <td colspan="2" align="center"><fmt:message key="systemsettings.http.response.headers"/></td>
+        <td colspan="2" align="center"><spring:message code="systemsettings.http.response.headers"/></td>
       </tr>
       <tr>
-        <td colspan="2" align="center"><textarea placeholder="<fmt:message key="systemsettings.http.response.headers"/>" rows="5" cols="60" id="<c:out value="<%= SystemSettingsDAO.HTTP_RESPONSE_HEADERS %>"/>"></textarea></td>
+        <td colspan="2" align="center"><textarea placeholder="<spring:message code="systemsettings.http.response.headers"/>" rows="5" cols="60" id="<c:out value="<%= SystemSettingsDAO.HTTP_RESPONSE_HEADERS %>"/>"></textarea></td>
       </tr>
       <tr>
         <td colspan="2" id="httpMessage" class="formError"></td>
@@ -801,7 +855,7 @@
     <table width="100%">
       <tr>
         <td>
-          <span class="smallTitle"><fmt:message key="systemSettings.dataRetentionSettings"/></span>
+          <span class="smallTitle"><spring:message code="systemSettings.dataRetentionSettings"/></span>
           <tag:help id="dataRetentionSettings"/>
         </td>
         <td align="right">
@@ -812,12 +866,12 @@
     <table>
       <%--
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.groveLogging"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.groveLogging"/></td>
         <td class="formField"><input type="checkbox" id="<c:out value="<%= SystemSettingsDAO.GROVE_LOGGING %>"/>"/></td>
       </tr>
       --%>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.purgeEvents"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.purgeEvents"/></td>
         <td class="formField">
           <input id="<c:out value="<%= SystemSettingsDAO.EVENT_PURGE_PERIODS %>"/>" type="text" class="formShort"/>
           <select id="<c:out value="<%= SystemSettingsDAO.EVENT_PURGE_PERIOD_TYPE %>"/>">
@@ -826,7 +880,7 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.purgeReports"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.purgeReports"/></td>
         <td class="formField">
           <input id="<c:out value="<%= SystemSettingsDAO.REPORT_PURGE_PERIODS %>"/>" type="text" class="formShort"/>
           <select id="<c:out value="<%= SystemSettingsDAO.REPORT_PURGE_PERIOD_TYPE %>"/>">
@@ -835,7 +889,7 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.futureDateLimit"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.futureDateLimit"/></td>
         <td class="formField">
           <input id="<c:out value="<%= SystemSettingsDAO.FUTURE_DATE_LIMIT_PERIODS %>"/>" type="text" class="formShort"/>
           <select id="<c:out value="<%= SystemSettingsDAO.FUTURE_DATE_LIMIT_PERIOD_TYPE %>"/>">
@@ -844,17 +898,17 @@
         </td>
       </tr>
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.valuesLimitForPurge"/></td>
-        <td><input type="button" value="<fmt:message key="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#data-retention-settings'"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.valuesLimitForPurge"/></td>
+        <td><input type="button" value="<spring:message code="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#data-retention-settings'"/></td>
       </tr>
       <tr>
         <td colspan="2" align="center">
-          <input type="button" value="<fmt:message key="systemSettings.purgeData"/>" onclick="checkPurgeAllData()" style="margin: 5px;"/>
+          <input type="button" value="<spring:message code="systemSettings.purgeData"/>" onclick="checkPurgeAllData()" style="margin: 5px;"/>
         </td>
       </tr>
       <tr>
         <td colspan="2" align="center">
-          <input type="button" value="<fmt:message key="systemSettings.purgeNow"/>" onclick="purgeNow()" style="margin: 5px;"/>
+          <input type="button" value="<spring:message code="systemSettings.purgeNow"/>" onclick="purgeNow()" style="margin: 5px;"/>
         </td>
       </tr>
       <tr>
@@ -867,7 +921,7 @@
       <table width="100%">
         <tr>
           <td>
-            <span class="smallTitle"><fmt:message key="systemSettings.otherSettings"/></span>
+            <span class="smallTitle"><spring:message code="systemSettings.otherSettings"/></span>
             <tag:help id="otherSettings"/>
           </td>
           <td align="right">
@@ -875,91 +929,101 @@
           </td>
         </tr>
       </table>
-      <table>
+      <table id="settingsMisc">
         <tr>
-          <td class="formLabelRequired"><fmt:message key="systemSettings.uiPerformance"/></td>
+          <td class="formLabelRequired"><spring:message code="systemSettings.uiPerformance"/></td>
           <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.UI_PERFORMANCE %>"/>" type="number" class="formShort"/>
             <select id="uiPerformanceId" onchange="toUiPerformanceId()">
               <option value=""></option>
-              <option value="1000"><fmt:message key="systemSettings.uiPerformance.veryHigh"/></option>
-              <option value="2000"><fmt:message key="systemSettings.uiPerformance.high"/></option>
-              <option value="5000"><fmt:message key="systemSettings.uiPerformance.med"/></option>
-              <option value="10000"><fmt:message key="systemSettings.uiPerformance.low"/></option>
+              <option value="1000"><spring:message code="systemSettings.uiPerformance.veryHigh"/></option>
+              <option value="2000"><spring:message code="systemSettings.uiPerformance.high"/></option>
+              <option value="5000"><spring:message code="systemSettings.uiPerformance.med"/></option>
+              <option value="10000"><spring:message code="systemSettings.uiPerformance.low"/></option>
             </select>
           </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.misc.dataPointRuntimeValueSynchronized"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.misc.dataPointRuntimeValueSynchronized"/></td>
          <td class="formField">
            <select id="<c:out value="<%= SystemSettingsDAO.DATAPOINT_RUNTIME_VALUE_SYNCHRONIZED %>"/>">
-             <option value="NONE"><fmt:message key="systemsettings.misc.dataPointRuntimeValueSynchronized.none"/></option>
-             <option value="PARTIAL"><fmt:message key="systemsettings.misc.dataPointRuntimeValueSynchronized.partial"/></option>
-             <option value="ALL"><fmt:message key="systemsettings.misc.dataPointRuntimeValueSynchronized.all"/></option>
+             <option value="NONE"><spring:message code="systemsettings.misc.dataPointRuntimeValueSynchronized.none"/></option>
+             <option value="PARTIAL"><spring:message code="systemsettings.misc.dataPointRuntimeValueSynchronized.partial"/></option>
+             <option value="ALL"><spring:message code="systemsettings.misc.dataPointRuntimeValueSynchronized.all"/></option>
            </select>
          </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.view.forceFullScreen"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.view.forceFullScreen"/></td>
          <td class="formField">
            <input type="checkbox" id="<c:out value="<%= SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE %>"/>" />
          </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.view.hideShortcutDisableFullScreen"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.view.hideShortcutDisableFullScreen"/></td>
          <td class="formField">
            <input type="checkbox" id="<c:out value="<%= SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN %>"/>" />
          </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.event.pendingCacheEnabled"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.event.pendingCacheEnabled"/></td>
          <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.EVENT_PENDING_CACHE_ENABLED %>"/>" type="checkbox" />
          </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.event.pendingLimit"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.event.pendingLimit"/></td>
          <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.EVENT_PENDING_LIMIT %>"/>" type="number" class="formShort"/>
          </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.workitems.reporting.enabled"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.workitems.reporting.enabled"/></td>
          <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.WORK_ITEMS_REPORTING_ENABLED %>"/>" type="checkbox" onchange="workItemsReportingEnabledChange()"/>
          </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.workitems.reporting.itemspersecond.enabled"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.workitems.reporting.itemspersecond.enabled"/></td>
          <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_ENABLED %>"/>" type="checkbox" onchange="workItemsReportingItemsPerSecondEnabledChange()"/>
          </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.workitems.reporting.itemspersecond.limit"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.workitems.reporting.itemspersecond.limit"/></td>
          <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT %>"/>" type="number" class="formShort"/>
          </td>
         </tr>
         <tr>
-         <td class="formLabelRequired"><fmt:message key="systemsettings.threads.name.additional.length"/></td>
+         <td class="formLabelRequired"><spring:message code="systemsettings.threads.name.additional.length"/></td>
          <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.THREADS_NAME_ADDITIONAL_LENGTH %>"/>" type="number" class="formShort"/>
          </td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="systemsettings.webresource.graphics.path"/></td>
+          <td class="formLabelRequired"><spring:message code="systemsettings.webresource.graphics.path"/></td>
           <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH %>"/>" type="text" class="formShort" style="width: 300px;"/>
           </td>
-          <td colspan="2" id="uploadsPathMessage" class="formError"></td>
         </tr>
         <tr>
-          <td class="formLabelRequired"><fmt:message key="systemsettings.webresource.uploads.path"/></td>
+          <td class="formLabelRequired"><spring:message code="systemsettings.webresource.uploads.path"/></td>
           <td class="formField">
             <input id="<c:out value="<%= SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH %>"/>" type="text" class="formShort" style="width: 300px;"/>
           </td>
-          <td colspan="2" id="graphicsPathMessage" class="formError"></td>
+        </tr>
+        <tr>
+         <td class="formLabelRequired"><spring:message code="event.assign.enabled"/></td>
+          <td class="formField">
+           <input id="<c:out value="<%= SystemSettingsDAO.EVENT_ASSIGN_ENABLED %>"/>" type="checkbox" />
+          </td>
+        </tr>
+        <tr>
+          <td class="formLabelRequired"><spring:message code="systemsettings.reports.dataPointExtendedNameLengthLimit"/></td>
+          <td class="formField">
+            <input id="<c:out value="<%= SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT %>"/>" type="number" class="formShort"/>
+          </td>
         </tr>
         <tr>
           <td colspan="2" id="miscMessage" class="formError"></td>
@@ -972,7 +1036,7 @@
     <table align="center" "100%">
       <tr>
         <td>
-          <span class="smallTitle"><fmt:message key="systemSettings.dbConfiguration"/></span>
+          <span class="smallTitle"><spring:message code="systemSettings.dbConfiguration"/></span>
           <tag:help id="dbConfiguration"/>
         </td>
         <td align="right">
@@ -982,20 +1046,20 @@
       </table>
       <table align="center">
       <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.dbConfiguration.Derby"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.dbConfiguration.Derby"/></td>
         <td class="formField">
           <input id="radioDerby" name="db" type="radio"/>
         </td>
       </tr>
       
        <tr>
-        <td class="formLabelRequired"><fmt:message key="systemSettings.dbConfiguration.Mysql"/></td>
+        <td class="formLabelRequired"><spring:message code="systemSettings.dbConfiguration.Mysql"/></td>
         <td class="formField">
           <input id="radioMysql" name="db" type="radio"/>
         </td>
       </tr>
        <tr>
-        <td class="formLabel"><fmt:message key="systemSettings.dbConfiguration.Mssql"/></td>
+        <td class="formLabel"><spring:message code="systemSettings.dbConfiguration.Mssql"/></td>
         <td class="formField">
           <input id="radioMssql" name="db" type="radio" disabled/>
         </td>
@@ -1003,7 +1067,7 @@
        
        <tr>
         <td colspan="2" align="center">
-          <input type="button" value="<fmt:message key="systemSettings.dbBackup"/>" onclick="dbBackup()"/>
+          <input type="button" value="<spring:message code="systemSettings.dbBackup"/>" onclick="dbBackup()"/>
         </td>
       </tr>
       <tr>
@@ -1032,27 +1096,27 @@
          <table align="center" "100%">
            <tr>
              <td>
-               <span class="smallTitle"><fmt:message key="systemSettings.newUI"/></span>
+               <span class="smallTitle"><spring:message code="systemSettings.newUI"/></span>
                <tag:help id="newUISettings"/>
              </td>
           </tr>
        </table>
        <table>
                   <tr>
-                    <td class="formLabelRequired"><fmt:message key="systemSettings.smsDomain"/></td>
-                    <td colspan="2" align="center"><input type="button" value="<fmt:message key="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#sms-domain-settings'"/></td>
+                    <td class="formLabelRequired"><spring:message code="systemSettings.smsDomain"/></td>
+                    <td colspan="2" align="center"><input type="button" value="<spring:message code="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#sms-domain-settings'"/></td>
                   </tr>
                   <tr>
-                    <td class="formLabelRequired"><fmt:message key="systemSettings.amCharts"/></td>
-                    <td colspan="2" align="center"><input type="button" value="<fmt:message key="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#aggregation-settings'"/></td>
+                    <td class="formLabelRequired"><spring:message code="systemSettings.amCharts"/></td>
+                    <td colspan="2" align="center"><input type="button" value="<spring:message code="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#aggregation-settings'"/></td>
                   </tr>
                   <tr>
-                    <td class="formLabelRequired"><fmt:message key="systemSettings.defaultDataPointLoggingType"/></td>
-                    <td colspan="2" align="center"><input type="button" value="<fmt:message key="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#default-logging-type-settings'"/></td>
+                    <td class="formLabelRequired"><spring:message code="systemSettings.defaultDataPointLoggingType"/></td>
+                    <td colspan="2" align="center"><input type="button" value="<spring:message code="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#default-logging-type-settings'"/></td>
                   </tr>
                   <tr>
-                    <td class="formLabelRequired"><fmt:message key="systemSettings.environmentSettings"/></td>
-                    <td colspan="2" align="center"><input type="button" value="<fmt:message key="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#scada-configuration'"/></td>
+                    <td class="formLabelRequired"><spring:message code="systemSettings.environmentSettings"/></td>
+                    <td colspan="2" align="center"><input type="button" value="<spring:message code="systemSettings.setInNewUI"/>" onClick="location.href='app.shtm#/system-settings#scada-configuration'"/></td>
                   </tr>
                   <tr>
                     <td colspan="2" id="httpMessage" class="formError"></td>
@@ -1064,14 +1128,14 @@
         <table>
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="systemSettings.customCss.title"/></span>
+                <span class="smallTitle"><spring:message code="systemSettings.customCss.title"/></span>
               </td>
             </tr>
         </table>
         <table>
           <tr>
             <td>
-              <button onclick="showCssDialog()"><fmt:message key="systemSettings.customCss.edit"/></button>
+              <button onclick="showCssDialog()"><spring:message code="systemSettings.customCss.edit"/></button>
             </td>
           </tr>
         </table>
@@ -1083,10 +1147,10 @@
   <div id="css-editor-dialog">
         <div class="css-dialog-content">
           <div>
-            <h2><fmt:message key="systemSettings.customCss.dialog.title"/></h2>
+            <h2><spring:message code="systemSettings.customCss.dialog.title"/></h2>
           </div>
           <div class="note">
-            <fmt:message key="systemSettings.customCss.dialog.note"/>
+            <spring:message code="systemSettings.customCss.dialog.note"/>
           </div>
           <div class="css-dialog-editor">
             <textarea
@@ -1106,13 +1170,18 @@
           <table>
             <tr>
               <td>
-                <button onclick="hideCssDialog()"><fmt:message key="common.cancel"/></button>
+                <button onclick="hideCssDialog()"><spring:message code="common.close"/></button>
               </td>
               <td>
-                <button onclick="saveCssSettings()"><fmt:message key="common.save"/></button>
+                <button onclick="saveCustomCssConfig()"><spring:message code="common.save"/></button>
               </td>
             </tr>
           </table>
+          <table>
+            <tr>
+              <td colspan="2" id="customCssMessage" class="formError"></td>
+            </tr>
+          </table>
           </div>
         </div>
       </div>
diff --git a/WebContent/WEB-INF/jsp/users.jsp b/WebContent/WEB-INF/jsp/users.jsp
index 5469791503..af0f8e97d1 100644
--- a/WebContent/WEB-INF/jsp/users.jsp
+++ b/WebContent/WEB-INF/jsp/users.jsp
@@ -51,11 +51,11 @@
                 }
 
                 var usersProfileHtml = "", userProfileId, userProfileName;
-                usersProfileHtml += "<option value=" + <c:out value="<%= Common.NEW_ID %>"/> + ">"+ "<fmt:message key="userProfiles.none"/>" + "</option>";
+                usersProfileHtml += "<option value=" + <c:out value="<%= Common.NEW_ID %>"/> + ">"+ "<spring:message code="userProfiles.none"/>" + "</option>";
                 
                 for (k=0; k<data.usersProfiles.length; k++) {
                 	userProfileId = data.usersProfiles[k].id;
-                	userProfileName = data.usersProfiles[k].name;
+                	userProfileName = <c:out value="data.usersProfiles[k].name"/>;
                 	usersProfileHtml += "<option value=" + userProfileId + ">"+ userProfileName + "</option>";
                 }
                 $("usersProfilesList").innerHTML = usersProfileHtml;
@@ -66,22 +66,22 @@
                 for (i=0; i<dataSources.length; i++) {
                     id = "ds"+ dataSources[i].id;
                     dshtml += '<input type="checkbox" id="'+ id +'" onclick="dataSourceChange(this)">';
-                    dshtml += '<label for="'+ id +'"> '+ dataSources[i].name +'</label><br/>';
+                    dshtml += '<label for="'+ id +'"> '+ escapeHtml(dataSources[i].name) +'</label><br/>';
                     dshtml += '<div style="margin-left:25px;" id="dsps'+ dataSources[i].id +'">';
                     if (dataSources[i].points.length > 0) {
                         dshtml +=   '<table cellspacing="0" cellpadding="1">';
                         for (j=0; j<dataSources[i].points.length; j++) {
                             dp = dataSources[i].points[j];
                             dshtml += '<tr>';
-                            dshtml +=   '<td class="formLabelRequired">'+ dp.name +'</td>';
+                            dshtml +=   '<td class="formLabelRequired">'+ escapeHtml(dp.name) +'</td>';
                             dshtml +=   '<td>';
                             dshtml +=     '<input type="radio" name="dp'+ dp.id +'" id="dp'+ dp.id +'/0" value="0">';
-                            dshtml +=             '<label for="dp'+ dp.id +'/0"><fmt:message key="common.access.none"/></label> ';
+                            dshtml +=             '<label for="dp'+ dp.id +'/0"><spring:message code="common.access.none"/></label> ';
                             dshtml +=     '<input type="radio" name="dp'+ dp.id +'" id="dp'+ dp.id +'/1" value="1">';
-                            dshtml +=             '<label for="dp'+ dp.id +'/1"><fmt:message key="common.access.read"/></label> ';
+                            dshtml +=             '<label for="dp'+ dp.id +'/1"><spring:message code="common.access.read"/></label> ';
                             if (dp.settable) {
                                 dshtml +=     '<input type="radio" name="dp'+ dp.id +'" id="dp'+ dp.id +'/2" value="2">';
-                                dshtml +=             '<label for="dp'+ dp.id +'/2"><fmt:message key="common.access.set"/></label>';
+                                dshtml +=             '<label for="dp'+ dp.id +'/2"><spring:message code="common.access.set"/></label>';
                             }
                             dshtml +=   '</td>';
                             dshtml += '</tr>';
@@ -129,17 +129,17 @@
         show($("userDetails"));
         if(forceFullScreenMode) {
             document.getElementById("enableFullScreen").disabled = true;
-            document.getElementById("enableFullScreen").title = '<fmt:message key="user.view.forceAdminTitle"/>';
+            document.getElementById("enableFullScreen").title = '<spring:message code="user.view.forceAdminTitle"/>';
         } else {
             document.getElementById("enableFullScreen").disabled = false;
-            document.getElementById("enableFullScreen").title = '<fmt:message key="user.view.enableFullScreen"/>';
+            document.getElementById("enableFullScreen").title = '<spring:message code="user.view.enableFullScreen"/>';
         }
         if(forceHideShortcutDisableFulLScreen) {
             document.getElementById("hideShortcutDisableFullScreen").disabled = true;
-            document.getElementById("hideShortcutDisableFullScreen").title = '<fmt:message key="user.view.forceAdminTitle"/>';
+            document.getElementById("hideShortcutDisableFullScreen").title = '<spring:message code="user.view.forceAdminTitle"/>';
         } else {
             document.getElementById("hideShortcutDisableFullScreen").disabled = false;
-            document.getElementById("hideShortcutDisableFullScreen").title = '<fmt:message key="user.view.hideShortcutDisableFullScreen"/>';
+            document.getElementById("hideShortcutDisableFullScreen").title = '<spring:message code="user.view.hideShortcutDisableFullScreen"/>';
         }
         $set("username", user.username);
         $set("firstName", user.firstName);
@@ -273,19 +273,19 @@
         if (response.hasMessages)
             showDwrMessages(response.messages, "genericMessages");
         else if (!adminUser)
-            setUserMessage("<fmt:message key="users.dataSaved"/>");
+            setUserMessage("<spring:message code="users.dataSaved"/>");
         else {
             if (editingUserId == <c:out value="<%= Common.NEW_ID %>"/>) {
                 stopImageFader($("u"+ editingUserId +"Img"));
                 editingUserId = response.data.userId;
                 appendUser(editingUserId);
                 startImageFader($("u"+ editingUserId +"Img"));
-                setUserMessage("<fmt:message key="users.added"/>");
+                setUserMessage("<spring:message code="users.added"/>");
                 UsersDwr.getUser(editingUserId, updateUser);
 	            showUser(editingUserId, false);
             }
             else {
-	                setUserMessage("<fmt:message key="users.saved"/>");
+	                setUserMessage("<spring:message code="users.saved"/>");
 		            UsersDwr.getUser(editingUserId, updateUser);
 		            showUser(editingUserId, false);
                 }
@@ -323,7 +323,7 @@
     
     function updateUser(response) {
         var user = response.data ? response.data.user : response.user;
-        $("u"+ user.id +"Username").innerHTML = user.username;
+        $("u"+ user.id +"Username").textContent = user.username;
         setUserImg(user.admin, user.disabled, $("u"+ user.id +"Img"));
     }
     
@@ -386,7 +386,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="users.title"/></span>
+                <span class="smallTitle"><spring:message code="users.title"/></span>
                 <tag:help id="userAdministration"/>
               </td>
               <td align="right"><tag:img png="user_add" onclick="showUser(${applicationScope['constants.Common.NEW_ID']}, false)"
@@ -408,7 +408,7 @@
             <tr>
               <td>
                 <span class="smallTitle"><tag:img id="userImg" png="user_green" title="users.user"/>
-                <fmt:message key="users.details"/></span>
+                <spring:message code="users.details"/></span>
               </td>
               <td align="right">
                 <tag:img id="saveImg" png="save" onclick="saveUser();" title="common.save"/>
@@ -426,70 +426,70 @@
               <td colspan="2" id="userMessage" class="formError"></td>
             </tr>
             <tr id="usernameRow" style="display:none;">
-              <td class="formLabelRequired"><fmt:message key="users.username"/></td>
+              <td class="formLabelRequired"><spring:message code="users.username"/></td>
               <td class="formField"><input id="username" type="text"/></td>
             </tr>
             <tr id="firstNameRow">
-              <td class="formLabelRequired"><fmt:message key="users.firstName"/></td>
+              <td class="formLabelRequired"><spring:message code="users.firstName"/></td>
               <td class="formField"><input id="firstName" type="text"/></td>
             </tr>
             <tr id="lastNameRow">
-              <td class="formLabelRequired"><fmt:message key="users.lastName"/></td>
+              <td class="formLabelRequired"><spring:message code="users.lastName"/></td>
               <td class="formField"><input id="lastName" type="text"/></td>
             </tr>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="users.newPassword"/></td>
+              <td class="formLabelRequired"><spring:message code="users.newPassword"/></td>
               <td class="formField"><input id="password" type="text"/></td>
             </tr>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="users.email"/></td>
+              <td class="formLabelRequired"><spring:message code="users.email"/></td>
               <td class="formField"><input id="email" type="text" class="formLong"/></td>
             </tr>
             <tr>
-              <td class="formLabel"><fmt:message key="users.phone"/></td>
+              <td class="formLabel"><spring:message code="users.phone"/></td>
               <td class="formField"><input id="phone" type="text"/></td>
             </tr>
             <tr id="administrationRow" style="display:none;">
-              <td class="formLabelRequired"><fmt:message key="common.administrator"/></td>
+              <td class="formLabelRequired"><spring:message code="common.administrator"/></td>
               <td class="formField"><input id="administrator" type="checkbox" onclick="updateUserImg();"/></td>
             </tr>
             <tr id="disabledRow" style="display:none;">
-              <td class="formLabelRequired"><fmt:message key="common.disabled"/></td>
+              <td class="formLabelRequired"><spring:message code="common.disabled"/></td>
               <td class="formField"><input id="disabled" type="checkbox" onclick="updateUserImg();"/></td>
             </tr>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="users.receiveAlarmEmails"/></td>
+              <td class="formLabelRequired"><spring:message code="users.receiveAlarmEmails"/></td>
               <td class="formField"><select id="receiveAlarmEmails"><tag:alarmLevelOptions/></select></td>
             </tr>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="users.receiveOwnAuditEvents"/></td>
+              <td class="formLabelRequired"><spring:message code="users.receiveOwnAuditEvents"/></td>
               <td class="formField"><input id="receiveOwnAuditEvents" type="checkbox"/></td>
             </tr>
             <tr id="hideMenuRow" style="display:none;">
-              <td class="formLabelRequired"><fmt:message key="users.hideMenu"/></td>
+              <td class="formLabelRequired"><spring:message code="users.hideMenu"/></td>
               <td class="formField"><input id="hideMenu" type="checkbox"/></td>
             </tr>
             <tr id="homeUrlRow" style="display:none;">
-              <td class="formLabel"><fmt:message key="users.homeUrl"/></td>
+              <td class="formLabel"><spring:message code="users.homeUrl"/></td>
               <td class="formField"><input id="homeUrl" type="text"/></td>
             </tr>
             <tr>
-              <td class="formLabelRequired"><fmt:message key="users.theme"/></td>
+              <td class="formLabelRequired"><spring:message code="users.theme"/></td>
               <td class="formField"><select id="theme"><tag:ScadaThemeOptions/></select></td>
             </tr>
             <tbody id="usersProfilesListTable" style="display:none;">
             <tr>
-              <td class="formLabel"><fmt:message key="userProfiles.selectName"/></td>
+              <td class="formLabel"><spring:message code="userProfiles.selectName"/></td>
               <td class="formField"><select id="usersProfilesList" onchange="checkProfile()">
               </select></td>
             </tr>
             </tbody>
             <tr>
-             <td class="formLabelRequired"><fmt:message key="user.view.enableFullScreen"/></td>
+             <td class="formLabelRequired"><spring:message code="user.view.enableFullScreen"/></td>
              <td class="formField"><input type="checkbox" id="enableFullScreen" /></td>
             </tr>
             <tr>
-             <td class="formLabelRequired"><fmt:message key="user.view.hideShortcutDisableFullScreen"/></td>
+             <td class="formLabelRequired"><spring:message code="user.view.hideShortcutDisableFullScreen"/></td>
              <td class="formField"><input type="checkbox" id="hideShortcutDisableFullScreen" /></td>
             </tr>
             </div>
@@ -497,7 +497,7 @@
             <tbody id="dataSources" style="display:none;">
               <tr><td class="horzSeparator" colspan="2"></td></tr>
               <tr id="dataSources">
-                <td class="formLabelRequired"><fmt:message key="users.dataSources"/></td>
+                <td class="formLabelRequired"><spring:message code="users.dataSources"/></td>
                 <td class="formField" id="dataSourceList"></td>
               </tr>
             </tbody>
diff --git a/WebContent/WEB-INF/jsp/usersProfiles.jsp b/WebContent/WEB-INF/jsp/usersProfiles.jsp
index 4ae94c8237..6515924741 100644
--- a/WebContent/WEB-INF/jsp/usersProfiles.jsp
+++ b/WebContent/WEB-INF/jsp/usersProfiles.jsp
@@ -51,22 +51,22 @@
 	           for (i=0; i<dataSources.length; i++) {
 	               id = "ds"+ dataSources[i].id;
 	               dshtml += '<input type="checkbox" id="'+ id +'" onclick="dataSourceChange(this)">';
-	               dshtml += '<label for="'+ id +'"> '+ dataSources[i].name +'</label><br/>';
+	               dshtml += '<label for="'+ id +'"> '+ escapeHtml(dataSources[i].name) +'</label><br/>';
 	               dshtml += '<div style="margin-left:25px;" id="dsps'+ dataSources[i].id +'">';
 	               if (dataSources[i].points.length > 0) {
 	                   dshtml +=   '<table cellspacing="0" cellpadding="1">';
 	                   for (j=0; j<dataSources[i].points.length; j++) {
 	                       dp = dataSources[i].points[j];
 	                       dshtml += '<tr>';
-	                       dshtml +=   '<td class="formLabelRequired">'+ dp.name +'</td>';
+	                       dshtml +=   '<td class="formLabelRequired">'+ escapeHtml(dp.name) +'</td>';
 	                       dshtml +=   '<td>';
 	                       dshtml +=     '<input type="radio" name="dp'+ dp.id +'" id="dp'+ dp.id +'/0" value="0">';
-	                       dshtml +=             '<label for="dp'+ dp.id +'/0"><fmt:message key="common.access.none"/></label> ';
+	                       dshtml +=             '<label for="dp'+ dp.id +'/0"><spring:message code="common.access.none"/></label> ';
 	                       dshtml +=     '<input type="radio" name="dp'+ dp.id +'" id="dp'+ dp.id +'/1" value="1">';
-	                       dshtml +=             '<label for="dp'+ dp.id +'/1"><fmt:message key="common.access.read"/></label> ';
+	                       dshtml +=             '<label for="dp'+ dp.id +'/1"><spring:message code="common.access.read"/></label> ';
 	                       if (dp.settable) {
 	                           dshtml +=     '<input type="radio" name="dp'+ dp.id +'" id="dp'+ dp.id +'/2" value="2">';
-	                           dshtml +=             '<label for="dp'+ dp.id +'/2"><fmt:message key="common.access.set"/></label>';
+	                           dshtml +=             '<label for="dp'+ dp.id +'/2"><spring:message code="common.access.set"/></label>';
 	                       }
 	                       dshtml +=   '</td>';
 	                       dshtml += '</tr>';
@@ -92,11 +92,11 @@
 	                       wlhtml += '<tr>';
 	                       wlhtml +=   '<td>';
 	                       wlhtml +=     '<input type="radio" name="wl'+ id +'" id="wl'+ id +'/0" value="0" checked>';
-	                       wlhtml +=             '<label for="wl'+ id +'"><fmt:message key="common.access.none"/></label> ';
+	                       wlhtml +=             '<label for="wl'+ id +'"><spring:message code="common.access.none"/></label> ';
 	                       wlhtml +=     '<input type="radio" name="wl'+ id +'" id="wl'+ id +'/1" value="1">';
-	                       wlhtml +=             '<label for="wl'+ id +'"><fmt:message key="common.access.read"/></label> ';
+	                       wlhtml +=             '<label for="wl'+ id +'"><spring:message code="common.access.read"/></label> ';
 	                       wlhtml +=     '<input type="radio" name="wl'+ id +'" id="wl'+ id +'/2" value="2">';
-	                       wlhtml +=             '<label for="wl'+ id +'"><fmt:message key="common.access.set"/></label>';
+	                       wlhtml +=             '<label for="wl'+ id +'"><spring:message code="common.access.set"/></label>';
 	                       wlhtml +=   '</td>';
 	                       wlhtml += '</tr>';
 	                   wlhtml +=   '</table>';
@@ -116,11 +116,11 @@
 	                       vwhtml += '<tr>';
 	                       vwhtml +=   '<td>';
 	                       vwhtml +=     '<input type="radio" name="vw'+ id +'" id="vw'+ id +'/0" value="0" checked>';
-	                       vwhtml +=             '<label for="vw'+ id +'"><fmt:message key="common.access.none"/></label> ';
+	                       vwhtml +=             '<label for="vw'+ id +'"><spring:message code="common.access.none"/></label> ';
 	                       vwhtml +=     '<input type="radio" name="vw'+ id +'" id="vw'+ id +'/1" value="1">';
-	                       vwhtml +=             '<label for="vw'+ id +'"><fmt:message key="common.access.read"/></label> ';
+	                       vwhtml +=             '<label for="vw'+ id +'"><spring:message code="common.access.read"/></label> ';
 	                       vwhtml +=     '<input type="radio" name="vw'+ id +'" id="vw'+ id +'/2" value="2">';
-	                       vwhtml +=             '<label for="vw'+ id +'"><fmt:message key="common.access.set"/></label>';
+	                       vwhtml +=             '<label for="vw'+ id +'"><spring:message code="common.access.set"/></label>';
 	                       vwhtml +=   '</td>';
 	                       vwhtml += '</tr>';
 	                   vwhtml +=   '</table>';
@@ -255,7 +255,7 @@
         if (response.hasMessages)
             showDwrMessages(response.messages, "genericMessages");
         else if (!adminUser)
-            setUserProfileMessage("<fmt:message key="userProfiles.saved"/>");
+            setUserProfileMessage("<spring:message code="userProfiles.saved"/>");
         else {
             if (editingUserProfileId == <c:out value="<%= Common.NEW_ID %>"/>) 
             {
@@ -263,10 +263,10 @@
                 editingUserProfileId = response.data.userProfileId;
                 appendUserProfile(editingUserProfileId);
                 startImageFader($("u"+ editingUserProfileId +"Img"));
-                setUserProfileMessage("<fmt:message key="userProfiles.added"/>");
+                setUserProfileMessage("<spring:message code="userProfiles.added"/>");
                 show($("deleteButton"));
             } else {
-                setUserProfileMessage("<fmt:message key="userProfiles.saved"/>");
+                setUserProfileMessage("<spring:message code="userProfiles.saved"/>");
                 stopImageFader($("u"+ editingUserProfileId +"Img"));
         	}
             UsersProfilesDwr.getUserProfile(editingUserProfileId, updateUserProfile)
@@ -335,7 +335,7 @@
           <table width="100%">
             <tr>
               <td>
-                <span class="smallTitle"><fmt:message key="userProfiles.title"/></span>
+                <span class="smallTitle"><spring:message code="userProfiles.title"/></span>
               </td>
               <td align="right"><tag:img png="user_add" onclick="showUserProfile(${applicationScope['constants.Common.NEW_ID']})"
                       title="userProfiles.add" id="u${applicationScope['constants.Common.NEW_ID']}Img"/></td>
@@ -356,7 +356,7 @@
             <tr>
               <td>
                 <span class="smallTitle"><tag:img id="userImg" png="user_green" title="userProfile.user"/>
-                <fmt:message key="userProfiles.details"/></span>
+                <spring:message code="userProfiles.details"/></span>
               </td>
               <td align="right">
                 <tag:img png="save" id="saveButton" onclick="saveUserProfile();" title="common.save"/>
@@ -372,21 +372,21 @@
               <td colspan="2" id="userProfileMessage" class="formError"></td>
             </tr>
             <tr id="userProfileNameRow" style="display:none;">
-              <td class="formLabelRequired"><fmt:message key="userProfiles.name"/></td>
+              <td class="formLabelRequired"><spring:message code="userProfiles.name"/></td>
               <td class="formField"><input id="userProfileName" type="text"/></td>
             </tr>
             <tbody id="dataSources" style="display:none;">
               <tr><td class="horzSeparator" colspan="2"></td></tr>
               <tr id="dataSources">
-                <td class="formLabelRequired"><fmt:message key="userProfiles.dataSources"/></td>
+                <td class="formLabelRequired"><spring:message code="userProfiles.dataSources"/></td>
                 <td class="formField" id="dataSourceList"></td>
               </tr>
               <tr id="watchlists">
-                <td class="formLabelRequired"><fmt:message key="header.watchLists"/></td>
+                <td class="formLabelRequired"><spring:message code="header.watchLists"/></td>
                 <td class="formField" id="watchlistsList"></td>
               </tr>
               <tr id="views">
-                <td class="formLabelRequired"><fmt:message key="views.title"/></td>
+                <td class="formLabelRequired"><spring:message code="views.title"/></td>
                 <td class="formField" id="viewsList"></td>
               </tr>
             </tbody>
diff --git a/WebContent/WEB-INF/jsp/viewEdit.jsp b/WebContent/WEB-INF/jsp/viewEdit.jsp
index c05e6da1f9..25d4d9d4c6 100644
--- a/WebContent/WEB-INF/jsp/viewEdit.jsp
+++ b/WebContent/WEB-INF/jsp/viewEdit.jsp
@@ -277,7 +277,7 @@
 
     function deleteViewComponent(viewComponentId) {
         closeEditors();
-        if(confirm('<fmt:message key="common.confirmDelete"/>')) {
+        if(confirm('<spring:message code="common.confirmDelete"/>')) {
             ViewDwr.deleteViewComponent(viewComponentId, viewId);
 
             var div = $("c"+ viewComponentId);
@@ -346,7 +346,7 @@
     if (search === -1) {
       // Image format invalid.
       document.getElementById("backgroundImageMP").value = null;
-      alert("<fmt:message key="validate.imageExtension"/>");
+      alert("<spring:message code="validate.imageExtension"/>");
     }
   }
 
@@ -467,14 +467,14 @@
               <tr>
                 <td colspan="3">
                   <tag:img png="icon_view" title="viewEdit.editView"/>
-                  <span class="smallTitle"><fmt:message key="viewEdit.viewProperties"/></span>
+                  <span class="smallTitle"><spring:message code="viewEdit.viewProperties"/></span>
                   <tag:help id="editingGraphicalViews"/>
                 </td>
               </tr>
 
               <spring:bind path="form.view.name">
                 <tr>
-                  <td class="formLabelRequired" width="150"><fmt:message key="viewEdit.name"/></td>
+                  <td class="formLabelRequired" width="150"><spring:message code="viewEdit.name"/></td>
                   <td class="formField" width="250">
                     <input type="text" name="view.name" value="${status.value}"/>
                   </td>
@@ -486,7 +486,7 @@
 
               <spring:bind path="form.view.xid">
                 <tr>
-                  <td class="formLabelRequired" width="150"><fmt:message key="common.xid"/></td>
+                  <td class="formLabelRequired" width="150"><spring:message code="common.xid"/></td>
                   <td class="formField" width="250">
                     <input type="text" name="view.xid" value="${status.value}"/>
                   </td>
@@ -495,7 +495,7 @@
               </spring:bind>
               <spring:bind path="form.backgroundImageMP">
                 <tr>
-                  <td class="formLabelRequired"><fmt:message key="viewEdit.background"/></td>
+                  <td class="formLabelRequired"><spring:message code="viewEdit.background"/></td>
                   <td class="formField">
                     <input type="file" id="backgroundImageMP" name="backgroundImageMP" onchange="validateUploadImage()"/>
                   </td>
@@ -504,21 +504,21 @@
               </spring:bind>
               <tr>
                 <td colspan="2" align="center">
-                  <input type="submit" name="upload" value="<fmt:message key="viewEdit.upload"/>" onclick="window.onbeforeunload = null;"/>
-                  <input type="submit" name="clearImage" value="<fmt:message key="viewEdit.clearImage"/>" onclick="window.onbeforeunload = null;"/>
+                  <input type="submit" name="upload" value="<spring:message code="viewEdit.upload"/>" onclick="window.onbeforeunload = null;"/>
+                  <input type="submit" name="clearImage" value="<spring:message code="viewEdit.clearImage"/>" onclick="window.onbeforeunload = null;"/>
                 </td>
                 <td class="formError">${status.errorMessage}</td>
               </tr>
 
               <spring:bind path="form.view.anonymousAccess">
                 <tr>
-                  <td class="formLabelRequired" width="150"><fmt:message key="viewEdit.anonymous"/></td>
+                  <td class="formLabelRequired" width="150"><spring:message code="viewEdit.anonymous"/></td>
                   <td class="formField" width="250">
                   <tag:help id="anonymousView"/>
                     <sst:select name="view.anonymousAccess" value="${status.value}">
-                      <sst:option value="<%= Integer.toString(ShareUser.ACCESS_NONE) %>"><fmt:message key="common.access.none"/></sst:option>
-                      <sst:option value="<%= Integer.toString(ShareUser.ACCESS_READ) %>"><fmt:message key="common.access.read"/></sst:option>
-                      <sst:option value="<%= Integer.toString(ShareUser.ACCESS_SET) %>"><fmt:message key="common.access.set"/></sst:option>
+                      <sst:option value="<%= Integer.toString(ShareUser.ACCESS_NONE) %>"><spring:message code="common.access.none"/></sst:option>
+                      <sst:option value="<%= Integer.toString(ShareUser.ACCESS_READ) %>"><spring:message code="common.access.read"/></sst:option>
+                      <sst:option value="<%= Integer.toString(ShareUser.ACCESS_SET) %>"><spring:message code="common.access.set"/></sst:option>
                     </sst:select>
                   </td>
                   <td class="formError">${status.errorMessage}</td>
@@ -527,7 +527,7 @@
 
               <spring:bind path="form.view.resolution">
                 <tr>
-                  <td id="sizeLabel" class="formLabelRequired" width="150"><fmt:message key="viedEdit.viewSize" /></td>
+                  <td id="sizeLabel" class="formLabelRequired" width="150"><spring:message code="viedEdit.viewSize" /></td>
                   <td class="formField" width="250">
                     <sst:select id="view.resolution" name="view.resolution" value="${status.value}" onchange="resizeViewBackgroundToResolution(this.options[this.selectedIndex].value)">
                       <sst:option value="<%= Integer.toString(0) %>"> 640x480</sst:option>
@@ -552,8 +552,8 @@
 
               <tr>
                 <td colspan="2" align="center">
-                  <input type="submit" name="save" value="<fmt:message key="common.save"/>" onclick="window.onbeforeunload = null;"/>
-                  <input type="submit" name="cancel" value="<fmt:message key="common.cancel"/>"/>
+                  <input type="submit" name="save" value="<spring:message code="common.save"/>" onclick="window.onbeforeunload = null;"/>
+                  <input type="submit" name="cancel" value="<spring:message code="common.cancel"/>"/>
                 </td>
               </tr>
 
@@ -572,7 +572,7 @@
     <table>
       <tr>
         <td>
-          <fmt:message key="viewEdit.viewComponents"/>:
+          <spring:message code="viewEdit.viewComponents"/>:
           <select id="componentList"></select>
           <tag:img png="plugin_add" title="viewEdit.addViewComponent" onclick="addViewComponent()"/>
         </td>
@@ -580,13 +580,13 @@
 
         <td>
           <input type="checkbox" id="iconifyCB" onclick="iconizeClicked();"/>
-          <label for="iconifyCB"><fmt:message key="viewEdit.iconify"/></label>
+          <label for="iconifyCB"><spring:message code="viewEdit.iconify"/></label>
         </td>
 
-        <td class="formLabelRequired" width="350"><fmt:message key="viewEdit.viewDelete"/></td>
+        <td class="formLabelRequired" width="350"><spring:message code="viewEdit.viewDelete"/></td>
         <td class="formField" width="250">
           <input id="deleteCheckbox" type="checkbox" onclick="deleteConfirm()" style="padding-top:10px; vertical-align: middle;"/>
-          <input id="deleteButton" type="submit" name="delete" onclick="window.onbeforeunload = null; return confirm('<fmt:message key="common.confirmDelete"/>')" value="<fmt:message key="viewEdit.viewDeleteConfirm"/>" style="visibility:hidden; margin-left:15px;"/>
+          <input id="deleteButton" type="submit" name="delete" onclick="window.onbeforeunload = null; return confirm('<spring:message code="common.confirmDelete"/>')" value="<spring:message code="viewEdit.viewDeleteConfirm"/>" style="visibility:hidden; margin-left:15px;"/>
         </td>
 
       </tr>
@@ -706,7 +706,7 @@
             <div id="c_TEMPLATE_Content" style="display: none;"></div>
             <div id="c_TEMPLATE_Graph" class="enhancedImageChart"></div>
             <div id="c_TEMPLATE_LegendBox" class="enhancedImageChartLegend">
-            	<b><fmt:message key="graphic.enhancedImageChart.legend"/></b>
+            	<b><spring:message code="graphic.enhancedImageChart.legend"/></b>
 				<div id="c_TEMPLATE_Legend"></div>
             </div>
             <div id="c_TEMPLATE_Controls" class="controlsDiv">
diff --git a/WebContent/WEB-INF/jsp/views.jsp b/WebContent/WEB-INF/jsp/views.jsp
index 56053f67c5..5f8a84999c 100644
--- a/WebContent/WEB-INF/jsp/views.jsp
+++ b/WebContent/WEB-INF/jsp/views.jsp
@@ -243,7 +243,7 @@
 
 	<table class="subPageHeader" id="graphical">
 		<tr>
-			<td class="smallTitle"><fmt:message key="views.title" /> <tag:help
+			<td class="smallTitle"><spring:message code="views.title" /> <tag:help
 					id="graphicalViews" /></td>
 			<td width="50"></td>
 			<c:if test="${fn:length(views) != 0}">
@@ -277,7 +277,7 @@
 	<table id="fullScreenOut">
 		<tr>
 			<td class="smallTitle" id="fsOut">
-				<fmt:message key="fullScreenOut"/>
+				<spring:message code="fullScreenOut"/>
 			</td>
 		</tr>
 	</table>
diff --git a/WebContent/WEB-INF/jsp/watchList.jsp b/WebContent/WEB-INF/jsp/watchList.jsp
index 5b6dd8b054..2ad9d93b81 100644
--- a/WebContent/WEB-INF/jsp/watchList.jsp
+++ b/WebContent/WEB-INF/jsp/watchList.jsp
@@ -152,9 +152,12 @@
       }
 
       function addPoint(point, parent) {
+          var spanNode = document.createElement("span");
+          spanNode.id = 'ph'+ point.key +'Name';
+          spanNode.textContent = point.value;
           var pointNode = dojo.widget.createWidget("TreeNode", {
-                  title: "<img src='images/icon_comp.png'/> <span id='ph"+ point.key +"Name'>"+ point.value +"</span> "+
-                          "<img src='images/bullet_go.png' id='ph"+ point.key +"Image' title='<fmt:message key="watchlist.addToWatchlist"/>'/>",
+                  title: "<img src='images/icon_comp.png'/> " + spanNode.innerHTML +
+                          "<img src='images/bullet_go.png' id='ph"+ point.key +"Image' title='<spring:message code="watchlist.addToWatchlist"/>'/>",
                   object: point
           });
           parent.addChild(pointNode);
@@ -344,7 +347,7 @@
               show("p"+ pointId +"Delete");
           }
 
-          $("p"+ pointId +"Name").innerHTML = pointNames[pointId];
+          $("p"+ pointId +"Name").textContent = pointNames[pointId];
 
           // Disable the element in the point list.
           togglePointTreeIcon(pointId, false);
@@ -504,7 +507,7 @@
       function getChartData() {
     	  var pointIds = getChartPointList();
     	  if (pointIds.length == 0)
-    		  alert("<fmt:message key="watchlist.noExportables"/>");
+    		  alert("<spring:message code="watchlist.noExportables"/>");
     	  else {
               startImageFader($("chartDataImg"));
               WatchListDwr.getChartData(getChartPointList(), $get("fromYear"), $get("fromMonth"), $get("fromDay"),
@@ -639,7 +642,7 @@
       <div id="splitContainer" dojoType="SplitContainer" orientation="horizontal" sizerWidth="3" activeSizing="true" class="borderDiv"
               widgetId="splitContainer" style="width: 100%; height: 500px; resize:vertical;">
         <div dojoType="ContentPane" sizeMin="20" sizeShare="20" style="overflow:auto;padding:2px;">
-          <span class="smallTitle"><fmt:message key="watchlist.points"/></span> <tag:help id="watchListPoints"/><br/>
+          <span class="smallTitle"><spring:message code="watchlist.points"/></span> <tag:help id="watchListPoints"/><br/>
         <!-- <div style="margin:5px 0 10px 5px;">
           <select id="dpSelector" data-placeholder="Choose data point ..." class="chosen-select" style="width:80%;margin-bottom:10px;">
           	<option></option>
@@ -653,7 +656,7 @@
         <div dojoType="ContentPane" sizeMin="50" sizeShare="50" style="overflow:auto; padding:2px 10px 2px 2px;">
           <table cellpadding="0" cellspacing="0" width="100%">
             <tr>
-              <td class="smallTitle"><fmt:message key="watchlist.watchlist"/> <tag:help id="watchList"/></td>
+              <td class="smallTitle"><spring:message code="watchlist.watchlist"/> <tag:help id="watchList"/></td>
               <td align="right">
                 <sst:select id="watchListSelect" value="${selectedWatchList}" onchange="watchListChanged()"
                         onmouseover="closeLayers();">
@@ -666,10 +669,10 @@
                   <tag:img id="wlEditImg" png="pencil" title="watchlist.editListName"/>
                   <div id="wlEdit" style="visibility:hidden;left:0px;top:15px;" class="labelDiv"
                           onmouseout="hideLayer(this)">
-                    <fmt:message key="watchlist.newListName"/><br/>
+                    <spring:message code="watchlist.newListName"/><br/>
                     <input type="text" id="newWatchListName"
                             onkeypress="if (event.keyCode==13) $('saveWatchListNameLink').onclick();"/>
-                    <a class="ptr" id="saveWatchListNameLink" onclick="saveWatchListName()"><fmt:message key="common.save"/></a>
+                    <a class="ptr" id="saveWatchListNameLink" onclick="saveWatchListName()"><spring:message code="common.save"/></a>
                   </div>
                 </div>
 
@@ -718,7 +721,7 @@
                   <td id="p_TEMPLATE_Time" align="center"></td>
                   <td style="width:1px; white-space:nowrap;">
                     <input type="checkbox" name="chartCB" id="p_TEMPLATE_ChartCB" value="_TEMPLATE_" checked="checked"
-                            title="<fmt:message key="watchlist.consolidatedChart"/>"/>
+                            title="<spring:message code="watchlist.consolidatedChart"/>"/>
                     <tag:img png="icon_comp" title="watchlist.pointDetails"
                             onclick="window.location='data_point_details.shtm?dpid='+ getMangoId(this)"/>
                     <tag:img png="arrow_up_thin" id="p_TEMPLATE_MoveUp" title="watchlist.moveUp" style="display:none;"
@@ -734,7 +737,7 @@
             </table>
             <table id="watchListTable" width="100%"></table>
             <div id="emptyListMessage" style="color:#888888;padding:10px;text-align:center;">
-              <fmt:message key="watchlist.emptyList"/>
+              <spring:message code="watchlist.emptyList"/>
             </div>
           </div>
         </div>
@@ -745,7 +748,7 @@
       <div id="chartContainer" class="borderDiv" style="width: 100%; resize: vertical; overflow: hidden; height: 500px;">
         <table width="100%">
           <tr>
-            <td class="smallTitle"><fmt:message key="watchlist.chart"/> <tag:help id="watchListCharts"/></td>
+            <td class="smallTitle"><spring:message code="watchlist.chart"/> <tag:help id="watchListCharts"/></td>
             <td align="right"><input type="text" id="prevPeriodCount" class="formVeryShort"/>
             	<select id="prevPeriodType">
                 	<tag:timePeriodOptions min="true" h="true" d="true" w="true" mon="true" y="true"/>
diff --git a/WebContent/WEB-INF/lib/classmate-1.3.4.jar b/WebContent/WEB-INF/lib/classmate-1.3.4.jar
new file mode 100644
index 0000000000..5be6d9961f
Binary files /dev/null and b/WebContent/WEB-INF/lib/classmate-1.3.4.jar differ
diff --git a/WebContent/WEB-INF/lib/cssparser-0.9.30.jar b/WebContent/WEB-INF/lib/cssparser-0.9.30.jar
new file mode 100644
index 0000000000..1ee9271c84
Binary files /dev/null and b/WebContent/WEB-INF/lib/cssparser-0.9.30.jar differ
diff --git a/WebContent/WEB-INF/lib/hibernate-validator-6.0.23.Final.jar b/WebContent/WEB-INF/lib/hibernate-validator-6.0.23.Final.jar
new file mode 100644
index 0000000000..a6bed2af81
Binary files /dev/null and b/WebContent/WEB-INF/lib/hibernate-validator-6.0.23.Final.jar differ
diff --git a/WebContent/WEB-INF/lib/jackson-annotations-2.17.2.jar b/WebContent/WEB-INF/lib/jackson-annotations-2.17.2.jar
new file mode 100644
index 0000000000..c13bcb9104
Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-annotations-2.17.2.jar differ
diff --git a/WebContent/WEB-INF/lib/jackson-annotations-2.8.2.jar b/WebContent/WEB-INF/lib/jackson-annotations-2.8.2.jar
deleted file mode 100644
index 6b609adc7b..0000000000
Binary files a/WebContent/WEB-INF/lib/jackson-annotations-2.8.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jackson-core-2.17.2.jar b/WebContent/WEB-INF/lib/jackson-core-2.17.2.jar
new file mode 100644
index 0000000000..34be902661
Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-core-2.17.2.jar differ
diff --git a/WebContent/WEB-INF/lib/jackson-core-2.8.2.jar b/WebContent/WEB-INF/lib/jackson-core-2.8.2.jar
deleted file mode 100644
index 54c321e164..0000000000
Binary files a/WebContent/WEB-INF/lib/jackson-core-2.8.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jackson-databind-2.17.2.jar b/WebContent/WEB-INF/lib/jackson-databind-2.17.2.jar
new file mode 100644
index 0000000000..3750b8c1cf
Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-databind-2.17.2.jar differ
diff --git a/WebContent/WEB-INF/lib/jackson-databind-2.8.2.jar b/WebContent/WEB-INF/lib/jackson-databind-2.8.2.jar
deleted file mode 100644
index 503d0f79b6..0000000000
Binary files a/WebContent/WEB-INF/lib/jackson-databind-2.8.2.jar and /dev/null differ
diff --git a/WebContent/WEB-INF/lib/jackson-datatype-jdk8-2.17.2.jar b/WebContent/WEB-INF/lib/jackson-datatype-jdk8-2.17.2.jar
new file mode 100644
index 0000000000..c6ff58aed9
Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-datatype-jdk8-2.17.2.jar differ
diff --git a/WebContent/WEB-INF/lib/jackson-datatype-jsr310-2.17.2.jar b/WebContent/WEB-INF/lib/jackson-datatype-jsr310-2.17.2.jar
new file mode 100644
index 0000000000..3aa01f1ee7
Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-datatype-jsr310-2.17.2.jar differ
diff --git a/WebContent/WEB-INF/lib/jboss-logging-3.3.2.Final.jar b/WebContent/WEB-INF/lib/jboss-logging-3.3.2.Final.jar
new file mode 100644
index 0000000000..67cde710fc
Binary files /dev/null and b/WebContent/WEB-INF/lib/jboss-logging-3.3.2.Final.jar differ
diff --git a/WebContent/WEB-INF/lib/sac-1.3.jar b/WebContent/WEB-INF/lib/sac-1.3.jar
new file mode 100644
index 0000000000..39b92b1d89
Binary files /dev/null and b/WebContent/WEB-INF/lib/sac-1.3.jar differ
diff --git a/WebContent/WEB-INF/lib/validation-api-2.0.1.Final.jar b/WebContent/WEB-INF/lib/validation-api-2.0.1.Final.jar
new file mode 100644
index 0000000000..2368e10a53
Binary files /dev/null and b/WebContent/WEB-INF/lib/validation-api-2.0.1.Final.jar differ
diff --git a/WebContent/WEB-INF/snippet/alarmList.jsp b/WebContent/WEB-INF/snippet/alarmList.jsp
index 122b4e8527..1dcaa967ee 100644
--- a/WebContent/WEB-INF/snippet/alarmList.jsp
+++ b/WebContent/WEB-INF/snippet/alarmList.jsp
@@ -19,35 +19,45 @@
 
 <table cellspacing="1" cellpadding="0" border="0" style="width: ${width}px;">
     <tr class="rowHeader">
-	    <c:if test="${!hideIdColumn}"><td><fmt:message key="events.id"/></td></c:if>
-	    <c:if test="${!hideAlarmLevelColumn}"><td><fmt:message key="common.alarmLevel"/></td></c:if>
-	    <c:if test="${!hideTimestampColumn}"><td><fmt:message key="common.time"/></td></c:if>
-	    <td><fmt:message key="events.msg"/></td>
-	    <c:if test="${!hideInactivityColumn}"><td><fmt:message key="common.inactiveTime"/></td></c:if>
+	    <c:if test="${!hideIdColumn}"><td><spring:message code="events.id"/></td></c:if>
+	    <c:if test="${!hideAlarmLevelColumn}"><td><spring:message code="common.alarmLevel"/></td></c:if>
+	    <c:if test="${!hideTimestampColumn}"><td><spring:message code="common.time"/></td></c:if>
+	    <td><spring:message code="events.msg"/></td>
+	    <c:if test="${!hideInactivityColumn}"><td><spring:message code="common.inactiveTime"/></td></c:if>
+	    <c:if test="${isEventAssignEnabled and !hideAssigneeColumn}"><td><spring:message code="common.assignee"/></td></c:if>
 	    <c:if test="${!hideAckColumn}"> <td>&nbsp;</td></c:if>
     </tr>
-    <c:if test="${empty events}"><tr><td colspan="6"><b><fmt:message key="events.emptyList"/></b></td></tr></c:if>
+    <c:if test="${empty events}"><tr><td colspan="6"><b><spring:message code="events.emptyList"/></b></td></tr></c:if>
     <c:forEach items="${events}" var="event" varStatus="status">
       <tr class="rowTable<c:if test="${status.index % 2 == 1}">Alt</c:if>">
       	<c:if test="${!hideIdColumn}"><td align="center">${event.id}</td></c:if>
       	<c:if test="${!hideAlarmLevelColumn}"><td align="center"><tag:eventIcon event="${event}"/></td></c:if>
         <c:if test="${!hideTimestampColumn}"><td align="center">${sst:time(event.activeTimestamp)}</td></c:if>
         <td onmouseover="this.style.whiteSpace='normal'" onmouseout="this.style.whiteSpace='nowrap'" style=" white-space: nowrap; max-width:100vh;">
-        <p style="margin:auto; overflow: hidden; text-overflow: ellipsis; font-weight: bold;"><sst:i18n message="${event.message}"/></p></td>
+        <p style="margin:auto; overflow: hidden; text-overflow: ellipsis; font-weight: bold;"><sst:i18n message="${event.message}"/></p>
+        </td>
         <c:if test="${!hideInactivityColumn}">
 	        <td>
 	          <c:choose>
 	            <c:when test="${event.active}">
-	              <fmt:message key="common.active"/>
+	              <spring:message code="common.active"/>
 	              <a href="events.shtm"><tag:img png="flag_white" title="common.active"/></a>
 	            </c:when>
-	            <c:when test="${!event.rtnApplicable}"><fmt:message key="common.nortn"/></c:when>
+	            <c:when test="${!event.rtnApplicable}"><spring:message code="common.nortn"/></c:when>
 	            <c:otherwise>
 	              ${sst:time(event.rtnTimestamp)} - <sst:i18n message="${event.rtnMessage}"/>
 	            </c:otherwise>
 	          </c:choose>
 	        </td>
         </c:if>
+        <c:if test="${isEventAssignEnabled and !hideAssigneeColumn}">
+          <td>
+            <c:if test="${event.assignee}">
+              ${sst:time(event.assigneeTimestamp)}
+              <sst:i18n message="${event.assigneeMessage}"/>
+            </c:if>
+          </td>
+        </c:if>
         <c:if test="${!hideAckColumn}"> <td> <tag:alarmAck event="${event}"/></td></c:if>  
       </tr>
     </c:forEach>
diff --git a/WebContent/WEB-INF/snippet/basicContent.jsp b/WebContent/WEB-INF/snippet/basicContent.jsp
index 7b507b8553..6bd5eb49ce 100644
--- a/WebContent/WEB-INF/snippet/basicContent.jsp
+++ b/WebContent/WEB-INF/snippet/basicContent.jsp
@@ -19,11 +19,11 @@
 <%@ include file="/WEB-INF/snippet/common.jsp" %>
 <c:set var="content"><%--
   --%><c:choose><%--
-    --%><c:when test="${displayPointName}">${pointComponent.name}:&nbsp;<b>${mango:htmlText(point, pointValue)}</b></c:when><%--
+    --%><c:when test="${displayPointName}"><c:out value="${pointComponent.name}"/>:&nbsp;<b>${mango:htmlText(point, pointValue)}</b></c:when><%--
     --%><c:otherwise>${mango:htmlText(point, pointValue)}</c:otherwise><%--
   --%></c:choose><%--
 --%></c:set>
-<c:if test="${!empty styleAttribute}"><div style="${styleAttribute}"></c:if>
+<c:if test="${!empty styleAttribute}"><div style="<c:out value="${styleAttribute}"/>"></c:if>
 <c:choose>
   <c:when test='${!empty viewComponent}'>
     <c:choose>
@@ -31,10 +31,10 @@
         <span class="simpleRenderer"/>${content}</span>
       </c:when>
       <c:when test='${viewComponent.bkgdColorOverride == "transparent"}'>
-        <span class="simpleRenderer" style="background:transparent;border:0;"/>${content}</span>
+        <span class="simpleRenderer" style="background:transparent;border:0;"/>${content}/></span>
       </c:when>
       <c:otherwise>
-        <span class="simpleRenderer" style="background-color:${viewComponent.bkgdColorOverride};"/>${content}</span>
+        <span class="simpleRenderer" style="background-color:<c:out value="${viewComponent.bkgdColorOverride}"/>;"/>${content}</span>
       </c:otherwise>
     </c:choose>
   </c:when>
@@ -47,7 +47,7 @@
         <span class="simpleRenderer" style="background:transparent;border:0;"/>${content}</span>
       </c:when>
       <c:otherwise>
-        <span class="simpleRenderer" style="background-color:${pointComponent.bkgdColorOverride};"/>${content}</span>
+        <span class="simpleRenderer" style="background-color:<c:out value="${pointComponent.bkgdColorOverride}"/>;"/>${content}</span>
       </c:otherwise>
     </c:choose>
   </c:otherwise>
diff --git a/WebContent/WEB-INF/snippet/changeContentRadio.jsp b/WebContent/WEB-INF/snippet/changeContentRadio.jsp
index e2597cc5da..eab4a74539 100644
--- a/WebContent/WEB-INF/snippet/changeContentRadio.jsp
+++ b/WebContent/WEB-INF/snippet/changeContentRadio.jsp
@@ -21,7 +21,7 @@
   point views with a BinaryTextRenderer.
 --%>
 <%@ include file="/WEB-INF/snippet/common.jsp" %>
-<fmt:message key="common.chooseSetPoint"/>:<br/>
+<spring:message code="common.chooseSetPoint"/>:<br/>
 <input type="radio"${pointValue.booleanValue == false ? " checked=\"checked\"" : ""} name="rbChange${componentId}"
         id="rbChange${componentId}F" onclick="mango.view.setPoint(${point.id}, '${componentId}', 'false')"/>
 <label for="rbChange${componentId}F">${point.textRenderer.zeroLabel}</label>
diff --git a/WebContent/WEB-INF/snippet/changeContentSelect.jsp b/WebContent/WEB-INF/snippet/changeContentSelect.jsp
index eb38a70e30..3e9c4f8ec2 100644
--- a/WebContent/WEB-INF/snippet/changeContentSelect.jsp
+++ b/WebContent/WEB-INF/snippet/changeContentSelect.jsp
@@ -21,7 +21,7 @@
   point views with a MultistateRenderer.
 --%>
 <%@ include file="/WEB-INF/snippet/common.jsp" %>
-<fmt:message key="common.chooseSetPoint"/>:<br/>
+<spring:message code="common.chooseSetPoint"/>:<br/>
 <sst:select value="${mango:rawText(point, pointValue)}" onchange="mango.view.setPoint(${point.id}, '${componentId}', this.value)">
   <c:forEach items="${point.textRenderer.multistateValues}" var="valueDef">
     <sst:option value="${valueDef.key}">${valueDef.text}</sst:option>
diff --git a/WebContent/WEB-INF/snippet/changeContentText.jsp b/WebContent/WEB-INF/snippet/changeContentText.jsp
index 22dcd9534b..1b584dac8c 100644
--- a/WebContent/WEB-INF/snippet/changeContentText.jsp
+++ b/WebContent/WEB-INF/snippet/changeContentText.jsp
@@ -17,11 +17,11 @@
     along with this program.  If not, see http://www.gnu.org/licenses/.
 --%>
 <%@ include file="/WEB-INF/snippet/common.jsp" %>
-<fmt:message key="common.enterSetPoint"/>:<br/>
+<spring:message code="common.enterSetPoint"/>:<br/>
 <input id="txtChange${componentId}" type="text" value="${mango:rawText(point, pointValue)}" 
         onkeypress="if (event.keyCode==13) $('txtSet${componentId}').onclick();"/>
 <a id="txtSet${componentId}" class="ptr"
-        onclick="mango.view.setPoint(${point.id}, '${componentId}', $('txtChange${componentId}').value);"><fmt:message key="common.set"/></a>
+        onclick="mango.view.setPoint(${point.id}, '${componentId}', $('txtChange${componentId}').value);"><spring:message code="common.set"/></a>
 <c:if test="${!hideClosingHint}" >
     </br>Double click to close
 </c:if>
diff --git a/WebContent/WEB-INF/snippet/compoundInfoContent.jsp b/WebContent/WEB-INF/snippet/compoundInfoContent.jsp
index 237f16fe52..7df81e420f 100644
--- a/WebContent/WEB-INF/snippet/compoundInfoContent.jsp
+++ b/WebContent/WEB-INF/snippet/compoundInfoContent.jsp
@@ -20,7 +20,7 @@
   This snippet supports all data types.
 --%>
 <%@ include file="/WEB-INF/jsp/include/tech.jsp" %>
-<b>${compoundComponent.name}</b><br/>
+<b><c:out value="${compoundComponent.name}"/></b><br/>
 <c:forEach items="${childData}" var="child">
   <c:if test="${!empty child.point}">
     &nbsp;&nbsp;&nbsp;
@@ -28,6 +28,6 @@
       <tag:img png="icon_comp" title="watchlist.pointDetails" style="display:inline"
               onclick="window.location='data_point_details.shtm?dpid=${child.point.id}'"/>
     </c:if>
-    ${child.name}: <span class="infoData">${mango:htmlText(child.point, child.pointValue)}</span><br/>
+    <c:out value="${child.name}"/>: <span class="infoData">${mango:htmlText(child.point, child.pointValue)}</span><br/>
   </c:if>
 </c:forEach>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/snippet/eventList.jsp b/WebContent/WEB-INF/snippet/eventList.jsp
index ffc358ac05..c0525036b8 100644
--- a/WebContent/WEB-INF/snippet/eventList.jsp
+++ b/WebContent/WEB-INF/snippet/eventList.jsp
@@ -63,6 +63,7 @@
       <td><sst:i18n key="events.msg"/></td>
       <td><sst:i18n key="common.inactiveTime"/></td>
       <c:if test="${!pendingEvents}"><td><sst:i18n key="events.acknowledged"/></td></c:if>
+      <c:if test="${isEventAssignEnabled}"><td><sst:i18n key="common.assignee"/></td></c:if>
       <td></td>
     </tr>
     <c:if test="${empty events}"><tr><td colspan="6"><b><sst:i18n key="events.emptyList"/></b></td></tr></c:if>
@@ -103,71 +104,16 @@
             </c:if>
           </td>
         </c:if>
+        <c:if test="${isEventAssignEnabled}">
+          <td>
+            <c:if test="${event.assignee}">
+              ${sst:time(event.assigneeTimestamp)}
+              <sst:i18n message="${event.assigneeMessage}"/>
+            </c:if>
+          </td>
+        </c:if>
         <td style="white-space:nowrap;">
           <tag:alarmAck event="${event}"/>
-          <c:choose>
-            <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.DATA_POINT']}">
-              <a href="data_point_details.shtm?dpid=${event.eventType.dataPointId}"><tag:img png="icon_comp" title="events.pointDetails"/></a>
-            </c:when>
-            <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.DATA_SOURCE']}">
-              <a href="data_source_edit.shtm?dsid=${event.eventType.dataSourceId}"><tag:img png="icon_ds_edit" title="events.editDataSource"/></a>
-            </c:when>
-            <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.SYSTEM']}">
-              <c:choose>
-                <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_VERSION_CHECK']}">
-                  <a href="http://mango.serotoninsoftware.com/download.jsp" target="_blank"><tag:img png="bullet_down" title="events.downloadMango"/></a>
-                </c:when>
-                <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_COMPOUND_DETECTOR_FAILURE']}">
-                  <a href="compound_events.shtm?cedid=${event.eventType.referenceId2}"><tag:img png="multi_bell" title="events.editCompound"/></a>
-                </c:when>
-                <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_SET_POINT_HANDLER_FAILURE']}">
-                  <a href="event_handlers.shtm?ehid=${event.eventType.referenceId2}"><tag:img png="cog" title="events.editEventHandler"/></a>
-                </c:when>
-                <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_POINT_LINK_FAILURE']}">
-                  <a href="point_links.shtm?plid=${event.eventType.referenceId2}"><tag:img png="link" title="events.editPointLink"/></a>
-                </c:when>
-              </c:choose>
-            </c:when>
-            <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.COMPOUND']}">
-              <a href="compound_events.shtm?cedid=${event.eventType.compoundEventDetectorId}"><tag:img png="multi_bell" title="events.editCompound"/></a>
-            </c:when>
-            <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.SCHEDULED']}">
-              <a href="scheduled_events.shtm?seid=${event.eventType.scheduleId}"><tag:img png="clock" title="events.editScheduledEvent"/></a>
-            </c:when>
-            <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.PUBLISHER']}">
-              <a href="publisher_edit.shtm?pid=${event.eventType.publisherId}"><tag:img png="transmit_edit" title="events.editPublisher"/></a>
-            </c:when>
-            <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.AUDIT']}">
-              <c:choose>
-                <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_DATA_SOURCE']}">
-                  <a href="data_source_edit.shtm?dsid=${event.eventType.referenceId2}"><tag:img png="icon_ds_edit" title="events.editDataSource"/></a>
-                </c:when>
-                <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_DATA_POINT']}">
-                  <a href="data_point_edit.shtm?dpid=${event.eventType.referenceId2}"><tag:img png="icon_comp_edit" title="events.pointEdit"/></a>
-                  <a href="data_source_edit.shtm?pid=${event.eventType.referenceId2}"><tag:img png="icon_ds_edit" title="events.editDataSource"/></a>
-                </c:when>
-                <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_POINT_EVENT_DETECTOR']}">
-                  <a href="data_point_edit.shtm?pedid=${event.eventType.referenceId2}"><tag:img png="icon_comp_edit" title="events.pointEdit"/></a>
-                </c:when>
-                <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_COMPOUND_EVENT_DETECTOR']}">
-                  <a href="compound_events.shtm?cedid=${event.eventType.referenceId2}"><tag:img png="multi_bell" title="events.editCompound"/></a>
-                </c:when>
-                <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_SCHEDULED_EVENT']}">
-                  <a href="scheduled_events.shtm?seid=${event.eventType.referenceId2}"><tag:img png="clock" title="events.editScheduledEvent"/></a>
-                </c:when>
-                <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_EVENT_HANDLER']}">
-                  <a href="event_handlers.shtm?ehid=${event.eventType.referenceId2}"><tag:img png="cog" title="events.editEventHandler"/></a>
-                </c:when>
-                <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_POINT_LINK']}">
-                  <a href="point_links.shtm?plid=${event.eventType.referenceId2}"><tag:img png="link" title="events.editPointLink"/></a>
-                </c:when>
-              </c:choose>
-            </c:when>
-            <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.MAINTENANCE']}">
-              <a href="maintenance_events.shtm?meid=${event.eventType.maintenanceId}"><tag:img png="hammer" title="events.editMaintenanceEvent"/></a>
-            </c:when>
-            <c:otherwise>(unknown event source id ${event.eventType.eventSourceId})</c:otherwise>
-          </c:choose>
         </td>
       </tr>
     </c:forEach>
diff --git a/WebContent/WEB-INF/snippet/flipbookChart.jsp b/WebContent/WEB-INF/snippet/flipbookChart.jsp
index 173d0ed6b5..3a9edcdb6d 100644
--- a/WebContent/WEB-INF/snippet/flipbookChart.jsp
+++ b/WebContent/WEB-INF/snippet/flipbookChart.jsp
@@ -20,7 +20,7 @@
 <%@ include file="/WEB-INF/snippet/common.jsp" %>
 <%@page import="com.serotonin.mango.web.servlet.ImageValueServlet"%>
 <c:choose>
-  <c:when test="${empty chartData}"><fmt:message key="common.noData"/></c:when>
+  <c:when test="${empty chartData}"><spring:message code="common.noData"/></c:when>
   <c:otherwise>
     <table cellpadding="0" cellspacing="0">
       <tr><td>
diff --git a/WebContent/WEB-INF/snippet/imageChart.jsp b/WebContent/WEB-INF/snippet/imageChart.jsp
index cd420ea1d6..0ded7844e7 100644
--- a/WebContent/WEB-INF/snippet/imageChart.jsp
+++ b/WebContent/WEB-INF/snippet/imageChart.jsp
@@ -20,5 +20,5 @@
 --%><%@ include file="/WEB-INF/jsp/include/tech.jsp" %><%--
 --%><c:choose><%--
   --%><c:when test="${empty pointValue}"><tag:img png="hourglass" title="common.noData"/></c:when><%--
-  --%><c:otherwise><img src="chart/${pointValue.time}_${point.chartRenderer.duration}_${point.id}.png?w=400&h=150" width="400" height="150" alt="<fmt:message key="common.genChart"/>"/></c:otherwise><%--
+  --%><c:otherwise><img src="chart/${pointValue.time}_${point.chartRenderer.duration}_${point.id}.png?w=400&h=150" width="400" height="150" alt="<spring:message code="common.genChart"/>"/></c:otherwise><%--
 --%></c:choose>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/snippet/imageChart2.jsp b/WebContent/WEB-INF/snippet/imageChart2.jsp
index b5247d53da..148610f2cd 100644
--- a/WebContent/WEB-INF/snippet/imageChart2.jsp
+++ b/WebContent/WEB-INF/snippet/imageChart2.jsp
@@ -19,4 +19,4 @@
 <%-- The snippet used for image charts in data point detail pages. Does not require the existence 
 of an image chart renderer object for the point --%>
 <img src="chart/${imageChartTime}_${imageChartDuration}_${imageChartPointId}.png?w=${imageChartWidth}&h=${imageChartHeight}" 
-        width="${imageChartWidth}" height="${imageChartHeight}" alt="<fmt:message key="common.genChart"/>"/>
\ No newline at end of file
+        width="${imageChartWidth}" height="${imageChartHeight}" alt="<spring:message code="common.genChart"/>"/>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/snippet/imageValueContent.jsp b/WebContent/WEB-INF/snippet/imageValueContent.jsp
index ca9fcddef6..2943a29317 100644
--- a/WebContent/WEB-INF/snippet/imageValueContent.jsp
+++ b/WebContent/WEB-INF/snippet/imageValueContent.jsp
@@ -21,6 +21,6 @@
 <c:if test="${!empty point.pointLocator.webcamLiveFeedCode}"><a href="webcam_live_feed.htm?pointId=${point.id}" target="webcamLiveFeed"></c:if>
 <c:choose>
   <c:when test="${empty error}"><img src="<%= ImageValueServlet.servletPath %>${pointValue.time}_${point.id}.${imageType}<c:if test="${!empty scalePercent}">?p=${scalePercent}</c:if>" alt="" border="0"/></c:when>
-  <c:otherwise><span class="simpleRenderer"/><fmt:message key="${error}"/></span></c:otherwise>
+  <c:otherwise><span class="simpleRenderer"/><spring:message code="${error}"/></span></c:otherwise>
 </c:choose>
 <c:if test="${!empty point.pointLocator.webcamLiveFeedCode}"><a href=""></a></c:if>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/snippet/imageValueThumbnail.jsp b/WebContent/WEB-INF/snippet/imageValueThumbnail.jsp
index 671d183fd9..098379bba2 100644
--- a/WebContent/WEB-INF/snippet/imageValueThumbnail.jsp
+++ b/WebContent/WEB-INF/snippet/imageValueThumbnail.jsp
@@ -19,5 +19,5 @@
 <%@ include file="/WEB-INF/jsp/include/tech.jsp" %>
 <%@page import="com.serotonin.mango.web.servlet.ImageValueServlet"%>
 <c:if test="${!empty point.pointLocator.webcamLiveFeedCode}"><a href="webcam_live_feed.htm?pointId=${point.id}" target="webcamLiveFeed"></c:if>
-<img src="<%= ImageValueServlet.servletPath %>${pointValue.time}_${point.id}.${pointValue.value.typeExtension}?w=80&h=80" alt="<fmt:message key="common.genThumb"/>" border="0"/>
+<img src="<%= ImageValueServlet.servletPath %>${pointValue.time}_${point.id}.${pointValue.value.typeExtension}?w=80&h=80" alt="<spring:message code="common.genThumb"/>" border="0"/>
 <c:if test="${!empty point.pointLocator.webcamLiveFeedCode}"></a></c:if>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/snippet/infoContent.jsp b/WebContent/WEB-INF/snippet/infoContent.jsp
index f1125bd419..e80ccc4ff2 100644
--- a/WebContent/WEB-INF/snippet/infoContent.jsp
+++ b/WebContent/WEB-INF/snippet/infoContent.jsp
@@ -24,15 +24,15 @@
   <tag:img png="icon_comp" title="watchlist.pointDetails" style="display:inline"
           onclick="window.location='data_point_details.shtm?dpid=${point.id}'"/>
 </c:if>
-<b>${pointComponent.name}</b><br/>
+<b><c:out value="${pointComponent.name}"/></b><br/>
 
 <c:if test="${!empty point}">
-  &nbsp;&nbsp;&nbsp;<fmt:message key="common.value"/>: 
+  &nbsp;&nbsp;&nbsp;<spring:message code="common.value"/>:
   <c:choose>
     <c:when test="${point.pointLocator.dataTypeId == applicationScope['constants.DataTypes.IMAGE']}">
       <jsp:include page="/WEB-INF/snippet/imageValueThumbnail.jsp"/>
     </c:when>
     <c:otherwise><span class="infoData">${mango:htmlText(point, pointValue)}</span><br/></c:otherwise>
   </c:choose>
-  <c:if test="${!empty pointValue}">&nbsp;&nbsp;&nbsp;<fmt:message key="common.time"/>: <span class="infoData">${mango:pointValueTime(pointValue)}</span><br/></c:if>
+  <c:if test="${!empty pointValue}">&nbsp;&nbsp;&nbsp;<spring:message code="common.time"/>: <span class="infoData">${mango:pointValueTime(pointValue)}</span><br/></c:if>
 </c:if>
diff --git a/WebContent/WEB-INF/snippet/statsChart.jsp b/WebContent/WEB-INF/snippet/statsChart.jsp
index 7978dda69e..8e013a7ef7 100644
--- a/WebContent/WEB-INF/snippet/statsChart.jsp
+++ b/WebContent/WEB-INF/snippet/statsChart.jsp
@@ -18,13 +18,13 @@
 --%>
 <%@ include file="/WEB-INF/snippet/common.jsp" %>
 <c:if test="${!empty startsAndRuntimes}">
-  <b><fmt:message key="common.stats.start"/></b>: ${sst:fullTime(start)}<br/>
-  <b><fmt:message key="common.stats.end"/></b>: ${sst:fullTime(end)}<br/>
+  <b><spring:message code="common.stats.start"/></b>: ${sst:fullTime(start)}<br/>
+  <b><spring:message code="common.stats.end"/></b>: ${sst:fullTime(end)}<br/>
   <table>
     <tr>
-      <th><fmt:message key="common.value"/></th>
-      <th><fmt:message key="common.stats.starts"/></th>
-      <th><fmt:message key="common.stats.runtime"/></th>
+      <th><spring:message code="common.value"/></th>
+      <th><spring:message code="common.stats.starts"/></th>
+      <th><spring:message code="common.stats.runtime"/></th>
     </tr>
   <c:forEach items="${startsAndRuntimes}" var="sar">
     <tr>
@@ -38,18 +38,18 @@
 <c:if test="${!empty average}">
   <c:choose>
     <c:when test="${noData}">
-      <b><fmt:message key="common.noData"/></b><br/>
+      <b><spring:message code="common.noData"/></b><br/>
     </c:when>
     <c:otherwise>
-      <b><fmt:message key="common.stats.start"/></b>: ${sst:fullTime(start)}<br/>
-      <b><fmt:message key="common.stats.end"/></b>: ${sst:fullTime(end)}<br/>
-      <b><fmt:message key="common.stats.min"/></b>: ${mango:specificHtmlTextValue(point, minimum)} @ ${sst:fullTime(minTime)}<br/>
-      <b><fmt:message key="common.stats.max"/></b>: ${mango:specificHtmlTextValue(point, maximum)} @ ${sst:fullTime(maxTime)}<br/>
-      <b><fmt:message key="common.stats.avg"/></b>: ${mango:specificHtmlTextValue(point, average)}<br/>
+      <b><spring:message code="common.stats.start"/></b>: ${sst:fullTime(start)}<br/>
+      <b><spring:message code="common.stats.end"/></b>: ${sst:fullTime(end)}<br/>
+      <b><spring:message code="common.stats.min"/></b>: ${mango:specificHtmlTextValue(point, minimum)} @ ${sst:fullTime(minTime)}<br/>
+      <b><spring:message code="common.stats.max"/></b>: ${mango:specificHtmlTextValue(point, maximum)} @ ${sst:fullTime(maxTime)}<br/>
+      <b><spring:message code="common.stats.avg"/></b>: ${mango:specificHtmlTextValue(point, average)}<br/>
       <c:if test="${!empty sum}">
-        <b><fmt:message key="common.stats.sum"/></b>: ${mango:specificHtmlTextValue(point, sum)}<br/>
+        <b><spring:message code="common.stats.sum"/></b>: ${mango:specificHtmlTextValue(point, sum)}<br/>
       </c:if>
     </c:otherwise>
   </c:choose>
 </c:if>
-<b><fmt:message key="common.stats.logEntries"/></b>: ${logEntries}
\ No newline at end of file
+<b><spring:message code="common.stats.logEntries"/></b>: ${logEntries}
\ No newline at end of file
diff --git a/WebContent/WEB-INF/snippet/tableChart.jsp b/WebContent/WEB-INF/snippet/tableChart.jsp
index ccf9b3b240..7dc1f664c1 100644
--- a/WebContent/WEB-INF/snippet/tableChart.jsp
+++ b/WebContent/WEB-INF/snippet/tableChart.jsp
@@ -19,19 +19,21 @@
 <%-- The snippet used for table charts in rollovers --%>
 <%@ include file="/WEB-INF/snippet/common.jsp" %>
 <c:choose>
-  <c:when test="${empty chartData}"><fmt:message key="common.noData"/></c:when>
+  <c:when test="${empty chartData}"><spring:message code="common.noData"/></c:when>
   <c:otherwise>
     <c:forEach items="${chartData}" var="historyPointValue">
       ${mango:pointValueTime(historyPointValue)} - ${mango:htmlText(point, historyPointValue)}
       <c:if test="${historyPointValue.annotated}">
-        (<fmt:message key="${historyPointValue.sourceDescriptionKey}">
-          <fmt:param>
-            <c:choose>
-              <c:when test="${empty historyPointValue.sourceDescriptionArgument}"><fmt:message key="common.deleted"/></c:when>
-              <c:otherwise>${historyPointValue.sourceDescriptionArgument}</c:otherwise>
-            </c:choose>
-          </fmt:param>
-        </fmt:message>)
+        <c:set value="" var="sourceDescriptionArgument"/>
+        <c:choose>
+            <c:when test="${empty historyPointValue.sourceDescriptionArgument}">
+                <c:set value='<spring:message code="common.deleted"/>' var="sourceDescriptionArgument"/>
+            </c:when>
+            <c:otherwise>
+                <c:set value="<c:out value='${historyPointValue.sourceDescriptionArgument}'/>" var="sourceDescriptionArgument"/>
+            </c:otherwise>
+        </c:choose>
+        (<spring:message code="${historyPointValue.sourceDescriptionKey}" arguments="${sourceDescriptionArgument}"/>)
       </c:if>
       <br/>
     </c:forEach>
diff --git a/WebContent/WEB-INF/snippet/warningContent.jsp b/WebContent/WEB-INF/snippet/warningContent.jsp
index 27bf7730e9..29f42d421e 100644
--- a/WebContent/WEB-INF/snippet/warningContent.jsp
+++ b/WebContent/WEB-INF/snippet/warningContent.jsp
@@ -22,13 +22,13 @@
       <c:when test="${!empty invalid}">
         <tr>
           <td valign="top"><tag:img png="warn" title="common.warning"/></td>
-          <td colspan="3"><fmt:message key="common.pointInvalid"/></td>
+          <td colspan="3"><spring:message code="common.pointInvalid"/></td>
         </tr>
       </c:when>
       <c:when test="${!empty disabled}">
         <tr>
           <td valign="top"><tag:img png="warn" title="common.warning"/></td>
-          <td colspan="3"><fmt:message key="common.pointWarning"/></td>
+          <td colspan="3"><spring:message code="common.pointWarning"/></td>
         </tr>
       </c:when>
     </c:choose>
@@ -36,8 +36,8 @@
       <tr>
         <td><tag:img png="exclamation" title="common.valueUnreliable"/></td>
         <td style="white-space:nowrap;" colspan="3">
-          <fmt:message key="common.valueUnreliable"/>
-          <tag:img png="arrow_refresh" title="common.refresh" onclick="WatchListDwr.forcePointRead(${point.id})" style="display:inline"/>
+          <spring:message code="common.valueUnreliable"/>
+          <tag:img png="arrow_refresh" title="common.refresh" onclick="MiscDwr.forcePointRead(${point.id})" style="display:inline"/>
         </td>
       </tr>
     </c:if>
diff --git a/WebContent/WEB-INF/snippet/warningIcon.jsp b/WebContent/WEB-INF/snippet/warningIcon.jsp
new file mode 100644
index 0000000000..b9c16068b0
--- /dev/null
+++ b/WebContent/WEB-INF/snippet/warningIcon.jsp
@@ -0,0 +1,9 @@
+<%@ include file="/WEB-INF/snippet/common.jsp" %>
+<c:choose>
+    <c:when test="${!empty invalid || !empty disabled || pointRT.attributes.UNRELIABLE || pointRT.attributes.DP_UPDATE_ERROR}">
+      <tag:img png="exclamation" title="common.valueUnreliable"/>
+    </c:when>
+    <c:otherwise>
+      <tag:img png="warn" title="common.warning"/>
+    </c:otherwise>
+</c:choose>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/snippet/watchListMessages.jsp b/WebContent/WEB-INF/snippet/watchListMessages.jsp
index 90701dae0f..7539d6e682 100644
--- a/WebContent/WEB-INF/snippet/watchListMessages.jsp
+++ b/WebContent/WEB-INF/snippet/watchListMessages.jsp
@@ -21,11 +21,11 @@
 --%>
 <%@ include file="/WEB-INF/snippet/common.jsp" %>
 <c:if test="${!empty disabled}">
-  <tag:img png="warn" title="common.pointWarning"/> <fmt:message key="common.pointWarning"/><br/>
+  <tag:img png="warn" title="common.pointWarning"/> <spring:message code="common.pointWarning"/><br/>
 </c:if>
 <c:if test="${pointRT.attributes.UNRELIABLE || pointRT.attributes.DP_UPDATE_ERROR}">
-  <tag:img png="exclamation" title="common.valueUnreliable"/> <fmt:message key="common.valueUnreliable"/>
-  <tag:img png="arrow_refresh" title="common.refresh" onclick="WatchListDwr.forcePointRead(${point.id})"/><br/>
+  <tag:img png="exclamation" title="common.valueUnreliable"/> <spring:message code="common.valueUnreliable"/>
+  <tag:img png="arrow_refresh" title="common.refresh" onclick="MiscDwr.forcePointRead(${point.id})"/><br/>
 </c:if>
 <c:forEach items="${events}" var="event">
 	<c:if test="${event.alarmLevel>0}">
diff --git a/WebContent/WEB-INF/spring-security.xml b/WebContent/WEB-INF/spring-security.xml
index 43b2e159d6..732fc40e23 100644
--- a/WebContent/WEB-INF/spring-security.xml
+++ b/WebContent/WEB-INF/spring-security.xml
@@ -24,6 +24,7 @@
         <!-- Other -->
         <intercept-url pattern="/**" access="hasRole('ROLE_SERVICES')" requires-channel="https"/>
 
+        <custom-filter ref="xssFilter" before="FIRST"/>
         <custom-filter position="BASIC_AUTH_FILTER" ref="basicAuthFilter"/>
         <session-management session-fixation-protection="none" />
     </http>
@@ -46,6 +47,7 @@
         <!-- Other -->
         <intercept-url pattern="/**" access="hasAnyRole('ROLE_HTTPDS')" />
 
+        <custom-filter ref="xssFilter" before="FIRST"/>
         <custom-filter position="BASIC_AUTH_FILTER" ref="basicAuthFilter"/>
         <session-management session-fixation-protection="none" />
     </http>
@@ -68,6 +70,7 @@
         <!-- Other -->
         <intercept-url pattern="/**" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_HTTPDS')" requires-channel="https"/>
 
+        <custom-filter ref="xssFilter" before="FIRST"/>
         <custom-filter position="BASIC_AUTH_FILTER" ref="basicAuthFilter"/>
         <session-management session-fixation-protection="none"/>
     </http>
@@ -90,6 +93,7 @@
         <!-- Other -->
         <intercept-url pattern="/**" access="hasAnyRole('ROLE_ADMIN')" requires-channel="https"/>
 
+        <custom-filter ref="xssFilter" before="FIRST"/>
         <custom-filter position="BASIC_AUTH_FILTER" ref="basicAuthFilter"/>
         <session-management session-fixation-protection="none"/>
     </http>
@@ -112,6 +116,7 @@
         <!-- Other -->
         <intercept-url pattern="/**" access="hasAnyRole('ROLE_ADMIN')" requires-channel="https"/>
 
+        <custom-filter ref="xssFilter" before="FIRST"/>
         <custom-filter position="BASIC_AUTH_FILTER" ref="basicAuthFilter"/>
         <session-management session-fixation-protection="none"/>
     </http>
@@ -181,6 +186,8 @@
         <intercept-url pattern="/dwr/call/plaincall/MiscDwr.acknowledgeAllPendingEvents.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_PUBLIC')" />
         <intercept-url pattern="/dwr/call/plaincall/MiscDwr.toggleSilence.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_PUBLIC')" />
         <intercept-url pattern="/dwr/call/plaincall/MiscDwr.acknowledgeEvent.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_PUBLIC')" />
+        <intercept-url pattern="/dwr/call/plaincall/MiscDwr.assignEvent.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
+        <intercept-url pattern="/dwr/call/plaincall/MiscDwr.unassignEvent.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
 
         <intercept-url pattern="/dwr/call/plaincall/MiscDwr.silenceAll.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
         <intercept-url pattern="/dwr/call/plaincall/MiscDwr.sendTestEmail.dwr" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" />
@@ -392,6 +399,9 @@
         <intercept-url pattern="/api/events/search" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_PUBLIC')" method="POST" />
         <intercept-url pattern="/api/events/highestUnsilencedLevelAlarm" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_PUBLIC')" method="GET" />
         <intercept-url pattern="/api/events/datapoint/{id}" access="@guard.hasDataPointReadPermission(request,#id,false)" method="GET" />
+        <intercept-url pattern="/api/events/ack/{id}" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" method="PUT" />
+        <intercept-url pattern="/api/events/assign/{id}" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" method="PUT" />
+        <intercept-url pattern="/api/events/unassign/{id}" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER')" method="PUT" />
 
         <!-- Alarm GET -->
         <intercept-url pattern="/api/alarms/live/{offset}/{limit}" access="hasAnyRole('ROLE_ADMIN', 'ROLE_USER', 'ROLE_PUBLIC')" method="GET" />
@@ -435,13 +445,14 @@
                     authentication-failure-url="/login.htm?error" login-page="/login.htm"
                     password-parameter="password" username-parameter="username"
                     login-processing-url="/login.htm"/>
-
+        <custom-filter ref="xssFilter" before="FIRST"/>
         <custom-filter after="SECURITY_CONTEXT_FILTER" ref="setDataSessionFilter" />
         <session-management session-fixation-protection="none" />
         <logout logout-url="/logout.htm" invalidate-session="true" delete-cookies="JSESSIONID"
                 success-handler-ref="headerWriterLogoutHandler"/>
     </http>
-    <http-firewall ref="defaultHttpFirewall"/>
+    <http-firewall ref="strictHttpFirewall"/>
+    <!--http-firewall ref="defaultHttpFirewall"/-->
 
     <!-- Websocket -->
     <!--websocket-message-broker same-origin-disabled="true">
@@ -513,4 +524,14 @@
     </b:bean>
 
     <b:bean id="getSecurityBeans" class="org.scada_lts.web.beans.GetSecurityBeans"/>
+
+    <b:bean id="strictHttpFirewall" class="org.springframework.security.web.firewall.StrictHttpFirewall">
+        <b:property name="allowSemicolon" value="false"/>
+        <b:property name="allowUrlEncodedSlash" value="false"/>
+        <b:property name="allowUrlEncodedPercent" value="false"/>
+        <b:property name="allowBackSlash" value="false"/>
+        <b:property name="allowUrlEncodedPeriod" value="false"/>
+    </b:bean>
+
+    <b:bean id="xssFilter" class="org.scada_lts.web.security.XssFilter"/>
 </b:beans>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/springDispatcher-servlet.xml b/WebContent/WEB-INF/springDispatcher-servlet.xml
index d7b17a4914..e1e0f8a877 100644
--- a/WebContent/WEB-INF/springDispatcher-servlet.xml
+++ b/WebContent/WEB-INF/springDispatcher-servlet.xml
@@ -1,17 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+    xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
         http://www.springframework.org/schema/beans     
         http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
         http://www.springframework.org/schema/context 
         http://www.springframework.org/schema/context/spring-context-4.2.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd
+        http://www.springframework.org/schema/util
+        http://www.springframework.org/schema/util/spring-util-4.2.xsd">
 
 	<context:component-scan base-package="org.scada_lts" />
-    <mvc:annotation-driven />
+    <mvc:annotation-driven>
+      <mvc:message-converters>
+        <ref bean="messageConverter"/>
+      </mvc:message-converters>
+    </mvc:annotation-driven>
+
+    <mvc:interceptors>
+      <mvc:interceptor>
+        <mvc:mapping path="/view_edit.shtm" />
+        <ref bean="commonData" />
+      </mvc:interceptor>
+    </mvc:interceptors>
 
 	<context:annotation-config />
     <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
@@ -215,4 +229,32 @@
   <bean id="dataSourceListController" class="org.scada_lts.web.mvc.controller.DataSourceListController" >
     <property name="viewName"><value>dataSourceList</value></property>
   </bean>
+
+  <bean id="objectMapper" class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean" scope="prototype">
+    <property name="serializers">
+      <array>
+        <bean class="org.scada_lts.web.security.XssProtectStringSerializer" />
+        <bean class="org.scada_lts.web.security.XssProtectCssStyleSerializer" />
+        <bean class="org.scada_lts.web.beans.serializer.ChronologySerializer" />
+        <bean class="org.scada_lts.web.beans.serializer.LocalDateTimeSerializer" />
+      </array>
+    </property>
+    <property name="featuresToEnable">
+      <array>
+        <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/>
+      </array>
+    </property>
+    <property name="featuresToDisable">
+      <array>
+        <util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.DEFAULT_VIEW_INCLUSION"/>
+        <util:constant static-field="com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES"/>
+        <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS"/>
+        <util:constant static-field="com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES"/>
+      </array>
+    </property>
+  </bean>
+
+  <bean id="messageConverter" class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter" scope="prototype">
+    <constructor-arg ref="objectMapper"/>
+  </bean>
 </beans>
diff --git a/WebContent/WEB-INF/tags/ScadaThemeOptions.tag b/WebContent/WEB-INF/tags/ScadaThemeOptions.tag
index 1f1a9ea059..be61519b83 100644
--- a/WebContent/WEB-INF/tags/ScadaThemeOptions.tag
+++ b/WebContent/WEB-INF/tags/ScadaThemeOptions.tag
@@ -1,5 +1,5 @@
 <%@include file="/WEB-INF/tags/decl.tagf" %>
 <%@tag body-content="empty" %>
-<option value="DEFAULT"><fmt:message key="users.theme.default"/></option>
-<option value="DARK"><fmt:message key="users.theme.dark"/></option>
-<option value="MODERN"><fmt:message key="users.theme.modern"/></option>
+<option value="DEFAULT"><spring:message code="users.theme.default"/></option>
+<option value="DARK"><spring:message code="users.theme.dark"/></option>
+<option value="MODERN"><spring:message code="users.theme.modern"/></option>
diff --git a/WebContent/WEB-INF/tags/alarmAck.tag b/WebContent/WEB-INF/tags/alarmAck.tag
index 4216d3ed2b..988b4b9769 100644
--- a/WebContent/WEB-INF/tags/alarmAck.tag
+++ b/WebContent/WEB-INF/tags/alarmAck.tag
@@ -23,6 +23,8 @@
     <c:when test="${event.acknowledged}"><tag:img png="tick_off" title="events.acknowledged" style="display:inline;"/></c:when>
     <c:otherwise>
       <c:if test="${not event.active}"><tag:img png="tick" id="ackImg${event.id}" onclick="ackEvent(${event.id})" title="events.acknowledge" style="display:inline;"/></c:if>
+      <c:if test="${isEventAssignEnabled and event.active and not event.assignee}"><tag:img png="user_add" id="assigneeImg${event.id}" onclick="assignEvent(${event.id})" title="events.assign" style="display:inline;"/></c:if>
+      <c:if test="${isEventAssignEnabled and event.active and event.assignee}"><tag:img png="user_delete" id="unassigneeImg${event.id}" onclick="unassignEvent(${event.id})" title="events.unassign" style="display:inline;"/></c:if>
       <c:choose>
         <c:when test="${event.silenced}">
           <tag:img png="sound_mute" id="silenceImg${event.id}" onclick="toggleSilence(${event.id})" title="events.unsilence" style="display:inline;"/>
@@ -33,4 +35,85 @@
       </c:choose>
     </c:otherwise>
   </c:choose>
+  <c:if test="${sessionUser.admin}" >
+      <c:choose>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.DATA_POINT']}">
+            <a href="data_point_details.shtm?dpid=${event.eventType.dataPointId}"><tag:img png="icon_comp" title="events.pointDetails"/></a>
+          </c:when>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.DATA_SOURCE']}">
+            <a href="data_source_edit.shtm?dsid=${event.eventType.dataSourceId}"><tag:img png="icon_ds_edit" title="events.editDataSource"/></a>
+          </c:when>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.DATA_SOURCE_POINT']}">
+            <a href="data_source_edit.shtm?dsid=${event.eventType.dataSourceId}&pid=${event.eventType.dataPointId}"><tag:img png="icon_ds_edit" title="events.editDataSource"/></a>
+            <a href="data_point_details.shtm?dpid=${event.eventType.dataPointId}"><tag:img png="icon_comp" title="events.pointDetails"/></a>
+          </c:when>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.SYSTEM']}">
+            <c:choose>
+              <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_VERSION_CHECK']}">
+                <a href="http://mango.serotoninsoftware.com/download.jsp" target="_blank"><tag:img png="bullet_down" title="events.downloadMango"/></a>
+              </c:when>
+              <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_COMPOUND_DETECTOR_FAILURE']}">
+                <a href="compound_events.shtm?cedid=${event.eventType.referenceId2}"><tag:img png="multi_bell" title="events.editCompound"/></a>
+              </c:when>
+              <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_SET_POINT_HANDLER_FAILURE']}">
+                <a href="event_handlers.shtm?ehid=${event.eventType.referenceId2}"><tag:img png="cog" title="events.editEventHandler"/></a>
+              </c:when>
+              <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_POINT_LINK_FAILURE']}">
+                <a href="point_links.shtm?plid=${event.eventType.referenceId2}"><tag:img png="link" title="events.editPointLink"/></a>
+              </c:when>
+              <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_EMAIL_SEND_FAILURE']}">
+                <a href="event_handlers.shtm?ehid=${event.eventType.referenceId2}"><tag:img png="cog" title="events.editEventHandler"/></a>
+              </c:when>
+              <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_PROCESS_FAILURE']}">
+                <a href="event_handlers.shtm?ehid=${event.eventType.referenceId2}"><tag:img png="cog" title="events.editEventHandler"/></a>
+              </c:when>
+              <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_SMS_SEND_FAILURE']}">
+                <a href="event_handlers.shtm?ehid=${event.eventType.referenceId2}"><tag:img png="cog" title="events.editEventHandler"/></a>
+              </c:when>
+              <c:when test="${event.eventType.systemEventTypeId == applicationScope['constants.SystemEventType.TYPE_SCRIPT_HANDLER_FAILURE']}">
+                <a href="event_handlers.shtm?ehid=${event.eventType.referenceId2}"><tag:img png="cog" title="events.editEventHandler"/></a>
+              </c:when>
+            </c:choose>
+          </c:when>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.COMPOUND']}">
+            <a href="compound_events.shtm?cedid=${event.eventType.compoundEventDetectorId}"><tag:img png="multi_bell" title="events.editCompound"/></a>
+          </c:when>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.SCHEDULED']}">
+            <a href="scheduled_events.shtm?seid=${event.eventType.scheduleId}"><tag:img png="clock" title="events.editScheduledEvent"/></a>
+          </c:when>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.PUBLISHER']}">
+            <a href="publisher_edit.shtm?pid=${event.eventType.publisherId}"><tag:img png="transmit_edit" title="events.editPublisher"/></a>
+          </c:when>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.AUDIT']}">
+            <c:choose>
+              <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_DATA_SOURCE']}">
+                <a href="data_source_edit.shtm?dsid=${event.eventType.referenceId2}"><tag:img png="icon_ds_edit" title="events.editDataSource"/></a>
+              </c:when>
+              <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_DATA_POINT']}">
+                <a href="data_point_edit.shtm?dpid=${event.eventType.referenceId2}"><tag:img png="icon_comp_edit" title="events.pointEdit"/></a>
+                <a href="data_source_edit.shtm?pid=${event.eventType.referenceId2}"><tag:img png="icon_ds_edit" title="events.editDataSource"/></a>
+              </c:when>
+              <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_POINT_EVENT_DETECTOR']}">
+                <a href="data_point_edit.shtm?pedid=${event.eventType.referenceId2}"><tag:img png="icon_comp_edit" title="events.pointEdit"/></a>
+              </c:when>
+              <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_COMPOUND_EVENT_DETECTOR']}">
+                <a href="compound_events.shtm?cedid=${event.eventType.referenceId2}"><tag:img png="multi_bell" title="events.editCompound"/></a>
+              </c:when>
+              <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_SCHEDULED_EVENT']}">
+                <a href="scheduled_events.shtm?seid=${event.eventType.referenceId2}"><tag:img png="clock" title="events.editScheduledEvent"/></a>
+              </c:when>
+              <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_EVENT_HANDLER']}">
+                <a href="event_handlers.shtm?ehid=${event.eventType.referenceId2}"><tag:img png="cog" title="events.editEventHandler"/></a>
+              </c:when>
+              <c:when test="${event.eventType.auditEventTypeId == applicationScope['constants.AuditEventType.TYPE_POINT_LINK']}">
+                <a href="point_links.shtm?plid=${event.eventType.referenceId2}"><tag:img png="link" title="events.editPointLink"/></a>
+              </c:when>
+            </c:choose>
+          </c:when>
+          <c:when test="${event.eventType.eventSourceId == applicationScope['constants.EventType.EventSources.MAINTENANCE']}">
+            <a href="maintenance_events.shtm?meid=${event.eventType.maintenanceId}"><tag:img png="hammer" title="events.editMaintenanceEvent"/></a>
+          </c:when>
+          <c:otherwise>(unknown event source id ${event.eventType.eventSourceId})</c:otherwise>
+      </c:choose>
+  </c:if>
 </c:if>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/alarmLevelOptions.tag b/WebContent/WEB-INF/tags/alarmLevelOptions.tag
index 7e3f0e6af6..bb48fe546e 100644
--- a/WebContent/WEB-INF/tags/alarmLevelOptions.tag
+++ b/WebContent/WEB-INF/tags/alarmLevelOptions.tag
@@ -23,22 +23,22 @@
 --%><c:choose>
   <c:when test="${sst}">
     <c:if test="${allOption}">
-      <sst:option value="-1"><fmt:message key="common.all"/></sst:option>
+      <sst:option value="-1"><spring:message code="common.all"/></sst:option>
     </c:if>
-    <sst:option value="<%= Integer.toString(AlarmLevels.NONE) %>"><fmt:message key="<%= AlarmLevels.NONE_DESCRIPTION %>"/></sst:option>
-    <sst:option value="<%= Integer.toString(AlarmLevels.INFORMATION) %>"><fmt:message key="<%= AlarmLevels.INFORMATION_DESCRIPTION %>"/></sst:option>
-    <sst:option value="<%= Integer.toString(AlarmLevels.URGENT) %>"><fmt:message key="<%= AlarmLevels.URGENT_DESCRIPTION %>"/></sst:option>
-    <sst:option value="<%= Integer.toString(AlarmLevels.CRITICAL) %>"><fmt:message key="<%= AlarmLevels.CRITICAL_DESCRIPTION %>"/></sst:option>
-    <sst:option value="<%= Integer.toString(AlarmLevels.LIFE_SAFETY) %>"><fmt:message key="<%= AlarmLevels.LIFE_SAFETY_DESCRIPTION %>"/></sst:option>
+    <sst:option value="<%= Integer.toString(AlarmLevels.NONE) %>"><spring:message code="<%= AlarmLevels.NONE_DESCRIPTION %>"/></sst:option>
+    <sst:option value="<%= Integer.toString(AlarmLevels.INFORMATION) %>"><spring:message code="<%= AlarmLevels.INFORMATION_DESCRIPTION %>"/></sst:option>
+    <sst:option value="<%= Integer.toString(AlarmLevels.URGENT) %>"><spring:message code="<%= AlarmLevels.URGENT_DESCRIPTION %>"/></sst:option>
+    <sst:option value="<%= Integer.toString(AlarmLevels.CRITICAL) %>"><spring:message code="<%= AlarmLevels.CRITICAL_DESCRIPTION %>"/></sst:option>
+    <sst:option value="<%= Integer.toString(AlarmLevels.LIFE_SAFETY) %>"><spring:message code="<%= AlarmLevels.LIFE_SAFETY_DESCRIPTION %>"/></sst:option>
   </c:when>
   <c:otherwise>
     <c:if test="${allOption}">
-      <option value="-1"><fmt:message key="common.all"/></option>
+      <option value="-1"><spring:message code="common.all"/></option>
     </c:if>
-    <option value="<%= AlarmLevels.NONE %>"><fmt:message key="<%= AlarmLevels.NONE_DESCRIPTION %>"/></option>
-    <option value="<%= AlarmLevels.INFORMATION %>"><fmt:message key="<%= AlarmLevels.INFORMATION_DESCRIPTION %>"/></option>
-    <option value="<%= AlarmLevels.URGENT %>"><fmt:message key="<%= AlarmLevels.URGENT_DESCRIPTION %>"/></option>
-    <option value="<%= AlarmLevels.CRITICAL %>"><fmt:message key="<%= AlarmLevels.CRITICAL_DESCRIPTION %>"/></option>
-    <option value="<%= AlarmLevels.LIFE_SAFETY %>"><fmt:message key="<%= AlarmLevels.LIFE_SAFETY_DESCRIPTION %>"/></option>
+    <option value="<%= AlarmLevels.NONE %>"><spring:message code="<%= AlarmLevels.NONE_DESCRIPTION %>"/></option>
+    <option value="<%= AlarmLevels.INFORMATION %>"><spring:message code="<%= AlarmLevels.INFORMATION_DESCRIPTION %>"/></option>
+    <option value="<%= AlarmLevels.URGENT %>"><spring:message code="<%= AlarmLevels.URGENT_DESCRIPTION %>"/></option>
+    <option value="<%= AlarmLevels.CRITICAL %>"><spring:message code="<%= AlarmLevels.CRITICAL_DESCRIPTION %>"/></option>
+    <option value="<%= AlarmLevels.LIFE_SAFETY %>"><spring:message code="<%= AlarmLevels.LIFE_SAFETY_DESCRIPTION %>"/></option>
   </c:otherwise>
 </c:choose>
diff --git a/WebContent/WEB-INF/tags/comments.tag b/WebContent/WEB-INF/tags/comments.tag
index 59dd2ca453..7e47cbcdca 100644
--- a/WebContent/WEB-INF/tags/comments.tag
+++ b/WebContent/WEB-INF/tags/comments.tag
@@ -23,9 +23,9 @@
     <td valign="top" width="16"><tag:img png="comment" title="notes.note"/></td>
     <td valign="top">
       <span class="copyTitle">
-        ${comment.prettyTime} <fmt:message key="notes.by"/>
+        ${comment.prettyTime} <spring:message code="notes.by"/>
         <c:choose>
-          <c:when test="${empty comment.username}"><fmt:message key="common.deleted"/></c:when>
+          <c:when test="${empty comment.username}"><spring:message code="common.deleted"/></c:when>
           <c:otherwise><c:out value="${comment.username}"/></c:otherwise>
         </c:choose>
       </span><br/>
diff --git a/WebContent/WEB-INF/tags/dataTypeOptions.tag b/WebContent/WEB-INF/tags/dataTypeOptions.tag
index f7a1ef323d..b173346863 100644
--- a/WebContent/WEB-INF/tags/dataTypeOptions.tag
+++ b/WebContent/WEB-INF/tags/dataTypeOptions.tag
@@ -23,8 +23,8 @@
 --%><%@attribute name="excludeAlphanumeric" type="java.lang.Boolean" %><%--
 --%><%@attribute name="excludeImage" type="java.lang.Boolean" %><%--
 --%><%@tag import="com.serotonin.mango.DataTypes"%><%--
---%><c:if test="${!excludeBinary}"><option value="<%= DataTypes.BINARY %>"><fmt:message key="common.dataTypes.binary"/></option></c:if>
-<c:if test="${!excludeMultistate}"><option value="<%= DataTypes.MULTISTATE %>"><fmt:message key="common.dataTypes.multistate"/></option></c:if>
-<c:if test="${!excludeNumeric}"><option value="<%= DataTypes.NUMERIC %>"><fmt:message key="common.dataTypes.numeric"/></option></c:if>
-<c:if test="${!excludeAlphanumeric}"><option value="<%= DataTypes.ALPHANUMERIC %>"><fmt:message key="common.dataTypes.alphanumeric"/></option></c:if>
-<c:if test="${!excludeImage}"><option value="<%= DataTypes.IMAGE %>"><fmt:message key="common.dataTypes.image"/></option></c:if>
\ No newline at end of file
+--%><c:if test="${!excludeBinary}"><option value="<%= DataTypes.BINARY %>"><spring:message code="common.dataTypes.binary"/></option></c:if>
+<c:if test="${!excludeMultistate}"><option value="<%= DataTypes.MULTISTATE %>"><spring:message code="common.dataTypes.multistate"/></option></c:if>
+<c:if test="${!excludeNumeric}"><option value="<%= DataTypes.NUMERIC %>"><spring:message code="common.dataTypes.numeric"/></option></c:if>
+<c:if test="${!excludeAlphanumeric}"><option value="<%= DataTypes.ALPHANUMERIC %>"><spring:message code="common.dataTypes.alphanumeric"/></option></c:if>
+<c:if test="${!excludeImage}"><option value="<%= DataTypes.IMAGE %>"><spring:message code="common.dataTypes.image"/></option></c:if>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/dateRange.tag b/WebContent/WEB-INF/tags/dateRange.tag
index b5414f9cdd..b34f459a7e 100644
--- a/WebContent/WEB-INF/tags/dateRange.tag
+++ b/WebContent/WEB-INF/tags/dateRange.tag
@@ -19,7 +19,7 @@
 --%><%@tag body-content="empty"%>
 <table>
   <tr>
-    <td><fmt:message key="common.dateRangeFrom"/></td>
+    <td><spring:message code="common.dateRangeFrom"/></td>
     <td><input type="text" id="fromYear" class="formVeryShort" value="${fromYear}"/></td>
     <td><sst:select id="fromMonth" value="${fromMonth}"><tag:monthOptions sst="true"/></sst:select></td>
     <td><sst:select id="fromDay" value="${fromDay}"><tag:dayOptions sst="true"/></sst:select></td>
@@ -30,10 +30,10 @@
     <td>:</td>
     <td><sst:select id="fromSecond" value="${fromSecond}"><tag:secondOptions sst="true"/></sst:select></td>
     <td><input type="checkbox" name="fromNone" id="fromNone" onclick="updateDateRange()"/><label
-            for="fromNone"><fmt:message key="common.inception"/></label></td>
+            for="fromNone"><spring:message code="common.inception"/></label></td>
   </tr>
   <tr>
-    <td><fmt:message key="common.dateRangeTo"/></td>
+    <td><spring:message code="common.dateRangeTo"/></td>
     <td><input type="text" id="toYear" class="formVeryShort" value="${toYear}"/></td>
     <td><sst:select id="toMonth" value="${toMonth}"><tag:monthOptions sst="true"/></sst:select></td>
     <td><sst:select id="toDay" value="${toDay}"><tag:dayOptions sst="true"/></sst:select></td>
@@ -44,6 +44,6 @@
     <td>:</td>
     <td><sst:select id="toSecond" value="${toSecond}"><tag:secondOptions sst="true"/></sst:select></td>
     <td><input type="checkbox" name="toNone" id="toNone" checked="checked" onclick="updateDateRange()"/><label
-            for="toNone"><fmt:message key="common.latest"/></label></td>
+            for="toNone"><spring:message code="common.latest"/></label></td>
   </tr>
 </table>
diff --git a/WebContent/WEB-INF/tags/displayView.tag b/WebContent/WEB-INF/tags/displayView.tag
index 654f1791f2..8ca8f7b293 100644
--- a/WebContent/WEB-INF/tags/displayView.tag
+++ b/WebContent/WEB-INF/tags/displayView.tag
@@ -22,7 +22,7 @@
 <script type="text/javascript">
     dojo.addOnLoad(function() {
         const viewBackground = document.getElementById("viewBackground");
-        if(!viewBackground.src.includes("spacer.gif")) {
+        if(viewBackground && !viewBackground.src.includes("spacer.gif")) {
             loadDefaultSizeContainer('${view.backgroundFilename}','viewBackground');
         }
     })
@@ -30,12 +30,12 @@
 <div id="viewContainer">
 <div id="viewContent" width="${view.width}" height="${view.height}">
   <c:choose>
-    <c:when test="${empty view}"><fmt:message key="${emptyMessageKey}"/></c:when>
+    <c:when test="${empty view || view.id == -1}"><spring:message code="${emptyMessageKey}"/> <a href="view_edit.shtm"><spring:message code="views.noViews.prefix"/></a></c:when>
     <c:when test="${empty view.backgroundFilename}">
       <img id="viewBackground" src="images/spacer.gif" alt="" width="${view.width}" height="${view.height}"/>
     </c:when>
     <c:otherwise>
-      <img id="viewBackground" src="${view.backgroundFilename}" alt=""/>
+      <img id="viewBackground" src="<c:out value="${view.backgroundFilename}"/>" alt=""/>
     </c:otherwise>
   </c:choose>
   
@@ -50,10 +50,10 @@
           <tag:pointComponent vc="${vc.leadComponent}"/>
           <c:choose>
             <c:when test="${empty vc.backgroundColour}"><c:set var="bkgd"></c:set></c:when>
-            <c:otherwise><c:set var="bkgd">background:${vc.backgroundColour};</c:set></c:otherwise>
+            <c:otherwise><c:set var="bkgd">background:<c:out value="${vc.backgroundColour}"/>;</c:set></c:otherwise>
           </c:choose>
           <div id="c${vc.id}Controls" class="controlContent" style="left:5px;top:5px;${bkgd}">
-            <b>${vc.name}</b><br/>
+            <b><c:out value="${vc.name}"/></b><br/>
             <c:forEach items="${vc.childComponents}" var="child">
               <c:if test="${child.viewComponent.visible && child.viewComponent.id != vc.leadComponent.id}">
                 <tag:pointComponent vc="${child.viewComponent}"/>
@@ -96,9 +96,9 @@
 			<c:forEach var="childComponent" items="${vc.childComponents}">
 				<c:if test="${not empty childComponent.viewComponent.extendedName}">
 					pointProps.push({
-						pointName: "${childComponent.viewComponent.extendedName}",
-	        			alias: "${childComponent.viewComponent.alias}",
-	        			color: "${childComponent.viewComponent.color}",
+						pointName: "<c:out value="${childComponent.viewComponent.extendedName}"/>",
+	        			alias: "<c:out value="${childComponent.viewComponent.alias}"/>",
+	        			color: "<c:out value="${childComponent.viewComponent.color}"/>",
 	        			strokeWidth: ${childComponent.viewComponent.strokeWidth},
 	        			lineType: "${childComponent.viewComponent.lineType}",
 	        			showPoints: ${childComponent.viewComponent.showPoints}
diff --git a/WebContent/WEB-INF/tags/dsEvents.tag b/WebContent/WEB-INF/tags/dsEvents.tag
index f720df8e71..6e0b0dc0f4 100644
--- a/WebContent/WEB-INF/tags/dsEvents.tag
+++ b/WebContent/WEB-INF/tags/dsEvents.tag
@@ -20,13 +20,13 @@
 --%><table width="100%">
   <tr><td class="smallTitle">
     <tag:img png="flag_white"/>
-    <fmt:message key="dsEdit.events.alarmLevels"/>
+    <spring:message code="dsEdit.events.alarmLevels"/>
   </td></tr>
 </table>
 <table cellspacing="1">
   <c:choose>
     <c:when test="${empty dataSource.eventTypes}">
-      <tr><td><b><fmt:message key="dsEdit.events.noEvents"/></b></td></tr>
+      <tr><td><b><spring:message code="dsEdit.events.noEvents"/></b></td></tr>
     </c:when>
     <c:otherwise>
       <c:forEach items="${dataSource.eventTypes}" var="type">
diff --git a/WebContent/WEB-INF/tags/engineeringUnits.tag b/WebContent/WEB-INF/tags/engineeringUnits.tag
index 67d7e0f7db..acb617468a 100644
--- a/WebContent/WEB-INF/tags/engineeringUnits.tag
+++ b/WebContent/WEB-INF/tags/engineeringUnits.tag
@@ -18,240 +18,240 @@
 --%><%@include file="/WEB-INF/tags/decl.tagf"%><%--
 --%><%@tag import="org.joda.time.DateTimeConstants"%><%--
 --%><%@tag body-content="empty"%>
-<optgroup label="<fmt:message key="engUnitGroup.acceleration"/>">
-  <sst:option value="166"><fmt:message key="engUnit.166"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.acceleration"/>">
+  <sst:option value="166"><spring:message code="engUnit.166"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.area"/>">
-  <sst:option value="0"><fmt:message key="engUnit.0"/></sst:option>
-  <sst:option value="116"><fmt:message key="engUnit.116"/></sst:option>
-  <sst:option value="1"><fmt:message key="engUnit.1"/></sst:option>
-  <sst:option value="115"><fmt:message key="engUnit.115"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.area"/>">
+  <sst:option value="0"><spring:message code="engUnit.0"/></sst:option>
+  <sst:option value="116"><spring:message code="engUnit.116"/></sst:option>
+  <sst:option value="1"><spring:message code="engUnit.1"/></sst:option>
+  <sst:option value="115"><spring:message code="engUnit.115"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.currency"/>">
-  <sst:option value="105"><fmt:message key="engUnit.105"/></sst:option>
-  <sst:option value="106"><fmt:message key="engUnit.106"/></sst:option>
-  <sst:option value="107"><fmt:message key="engUnit.107"/></sst:option>
-  <sst:option value="108"><fmt:message key="engUnit.108"/></sst:option>
-  <sst:option value="109"><fmt:message key="engUnit.109"/></sst:option>
-  <sst:option value="110"><fmt:message key="engUnit.110"/></sst:option>
-  <sst:option value="111"><fmt:message key="engUnit.111"/></sst:option>
-  <sst:option value="112"><fmt:message key="engUnit.112"/></sst:option>
-  <sst:option value="113"><fmt:message key="engUnit.113"/></sst:option>
-  <sst:option value="114"><fmt:message key="engUnit.114"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.currency"/>">
+  <sst:option value="105"><spring:message code="engUnit.105"/></sst:option>
+  <sst:option value="106"><spring:message code="engUnit.106"/></sst:option>
+  <sst:option value="107"><spring:message code="engUnit.107"/></sst:option>
+  <sst:option value="108"><spring:message code="engUnit.108"/></sst:option>
+  <sst:option value="109"><spring:message code="engUnit.109"/></sst:option>
+  <sst:option value="110"><spring:message code="engUnit.110"/></sst:option>
+  <sst:option value="111"><spring:message code="engUnit.111"/></sst:option>
+  <sst:option value="112"><spring:message code="engUnit.112"/></sst:option>
+  <sst:option value="113"><spring:message code="engUnit.113"/></sst:option>
+  <sst:option value="114"><spring:message code="engUnit.114"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.electrical"/>">
-  <sst:option value="2"><fmt:message key="engUnit.2"/></sst:option>
-  <sst:option value="3"><fmt:message key="engUnit.3"/></sst:option>
-  <sst:option value="167"><fmt:message key="engUnit.167"/></sst:option>
-  <sst:option value="168"><fmt:message key="engUnit.168"/></sst:option>
-  <sst:option value="169"><fmt:message key="engUnit.169"/></sst:option>
-  <sst:option value="170"><fmt:message key="engUnit.170"/></sst:option>
-  <sst:option value="171"><fmt:message key="engUnit.171"/></sst:option>
-  <sst:option value="4"><fmt:message key="engUnit.4"/></sst:option>
-  <sst:option value="172"><fmt:message key="engUnit.172"/></sst:option>
-  <sst:option value="145"><fmt:message key="engUnit.145"/></sst:option>
-  <sst:option value="122"><fmt:message key="engUnit.122"/></sst:option>
-  <sst:option value="123"><fmt:message key="engUnit.123"/></sst:option>
-  <sst:option value="173"><fmt:message key="engUnit.173"/></sst:option>
-  <sst:option value="174"><fmt:message key="engUnit.174"/></sst:option>
-  <sst:option value="175"><fmt:message key="engUnit.175"/></sst:option>
-  <sst:option value="5"><fmt:message key="engUnit.5"/></sst:option>
-  <sst:option value="124"><fmt:message key="engUnit.124"/></sst:option>
-  <sst:option value="6"><fmt:message key="engUnit.6"/></sst:option>
-  <sst:option value="7"><fmt:message key="engUnit.7"/></sst:option>
-  <sst:option value="8"><fmt:message key="engUnit.8"/></sst:option>
-  <sst:option value="9"><fmt:message key="engUnit.9"/></sst:option>
-  <sst:option value="10"><fmt:message key="engUnit.10"/></sst:option>
-  <sst:option value="11"><fmt:message key="engUnit.11"/></sst:option>
-  <sst:option value="12"><fmt:message key="engUnit.12"/></sst:option>
-  <sst:option value="13"><fmt:message key="engUnit.13"/></sst:option>
-  <sst:option value="176"><fmt:message key="engUnit.176"/></sst:option>
-  <sst:option value="177"><fmt:message key="engUnit.177"/></sst:option>
-  <sst:option value="14"><fmt:message key="engUnit.14"/></sst:option>
-  <sst:option value="15"><fmt:message key="engUnit.15"/></sst:option>
-  <sst:option value="178"><fmt:message key="engUnit.178"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.electrical"/>">
+  <sst:option value="2"><spring:message code="engUnit.2"/></sst:option>
+  <sst:option value="3"><spring:message code="engUnit.3"/></sst:option>
+  <sst:option value="167"><spring:message code="engUnit.167"/></sst:option>
+  <sst:option value="168"><spring:message code="engUnit.168"/></sst:option>
+  <sst:option value="169"><spring:message code="engUnit.169"/></sst:option>
+  <sst:option value="170"><spring:message code="engUnit.170"/></sst:option>
+  <sst:option value="171"><spring:message code="engUnit.171"/></sst:option>
+  <sst:option value="4"><spring:message code="engUnit.4"/></sst:option>
+  <sst:option value="172"><spring:message code="engUnit.172"/></sst:option>
+  <sst:option value="145"><spring:message code="engUnit.145"/></sst:option>
+  <sst:option value="122"><spring:message code="engUnit.122"/></sst:option>
+  <sst:option value="123"><spring:message code="engUnit.123"/></sst:option>
+  <sst:option value="173"><spring:message code="engUnit.173"/></sst:option>
+  <sst:option value="174"><spring:message code="engUnit.174"/></sst:option>
+  <sst:option value="175"><spring:message code="engUnit.175"/></sst:option>
+  <sst:option value="5"><spring:message code="engUnit.5"/></sst:option>
+  <sst:option value="124"><spring:message code="engUnit.124"/></sst:option>
+  <sst:option value="6"><spring:message code="engUnit.6"/></sst:option>
+  <sst:option value="7"><spring:message code="engUnit.7"/></sst:option>
+  <sst:option value="8"><spring:message code="engUnit.8"/></sst:option>
+  <sst:option value="9"><spring:message code="engUnit.9"/></sst:option>
+  <sst:option value="10"><spring:message code="engUnit.10"/></sst:option>
+  <sst:option value="11"><spring:message code="engUnit.11"/></sst:option>
+  <sst:option value="12"><spring:message code="engUnit.12"/></sst:option>
+  <sst:option value="13"><spring:message code="engUnit.13"/></sst:option>
+  <sst:option value="176"><spring:message code="engUnit.176"/></sst:option>
+  <sst:option value="177"><spring:message code="engUnit.177"/></sst:option>
+  <sst:option value="14"><spring:message code="engUnit.14"/></sst:option>
+  <sst:option value="15"><spring:message code="engUnit.15"/></sst:option>
+  <sst:option value="178"><spring:message code="engUnit.178"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.energy"/>">
-  <sst:option value="16"><fmt:message key="engUnit.16"/></sst:option>
-  <sst:option value="17"><fmt:message key="engUnit.17"/></sst:option>
-  <sst:option value="125"><fmt:message key="engUnit.125"/></sst:option>
-  <sst:option value="126"><fmt:message key="engUnit.126"/></sst:option>
-  <sst:option value="18"><fmt:message key="engUnit.18"/></sst:option>
-  <sst:option value="19"><fmt:message key="engUnit.19"/></sst:option>
-  <sst:option value="146"><fmt:message key="engUnit.146"/></sst:option>
-  <sst:option value="20"><fmt:message key="engUnit.20"/></sst:option>
-  <sst:option value="147"><fmt:message key="engUnit.147"/></sst:option>
-  <sst:option value="148"><fmt:message key="engUnit.148"/></sst:option>
-  <sst:option value="21"><fmt:message key="engUnit.21"/></sst:option>
-  <sst:option value="22"><fmt:message key="engUnit.22"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.energy"/>">
+  <sst:option value="16"><spring:message code="engUnit.16"/></sst:option>
+  <sst:option value="17"><spring:message code="engUnit.17"/></sst:option>
+  <sst:option value="125"><spring:message code="engUnit.125"/></sst:option>
+  <sst:option value="126"><spring:message code="engUnit.126"/></sst:option>
+  <sst:option value="18"><spring:message code="engUnit.18"/></sst:option>
+  <sst:option value="19"><spring:message code="engUnit.19"/></sst:option>
+  <sst:option value="146"><spring:message code="engUnit.146"/></sst:option>
+  <sst:option value="20"><spring:message code="engUnit.20"/></sst:option>
+  <sst:option value="147"><spring:message code="engUnit.147"/></sst:option>
+  <sst:option value="148"><spring:message code="engUnit.148"/></sst:option>
+  <sst:option value="21"><spring:message code="engUnit.21"/></sst:option>
+  <sst:option value="22"><spring:message code="engUnit.22"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.enthalpy"/>">
-  <sst:option value="23"><fmt:message key="engUnit.23"/></sst:option>
-  <sst:option value="149"><fmt:message key="engUnit.149"/></sst:option>
-  <sst:option value="150"><fmt:message key="engUnit.150"/></sst:option>
-  <sst:option value="24"><fmt:message key="engUnit.24"/></sst:option>
-  <sst:option value="117"><fmt:message key="engUnit.117"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.enthalpy"/>">
+  <sst:option value="23"><spring:message code="engUnit.23"/></sst:option>
+  <sst:option value="149"><spring:message code="engUnit.149"/></sst:option>
+  <sst:option value="150"><spring:message code="engUnit.150"/></sst:option>
+  <sst:option value="24"><spring:message code="engUnit.24"/></sst:option>
+  <sst:option value="117"><spring:message code="engUnit.117"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.entropy"/>">
-  <sst:option value="127"><fmt:message key="engUnit.127"/></sst:option>
-  <sst:option value="151"><fmt:message key="engUnit.151"/></sst:option>
-  <sst:option value="152"><fmt:message key="engUnit.152"/></sst:option>
-  <sst:option value="128"><fmt:message key="engUnit.128"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.entropy"/>">
+  <sst:option value="127"><spring:message code="engUnit.127"/></sst:option>
+  <sst:option value="151"><spring:message code="engUnit.151"/></sst:option>
+  <sst:option value="152"><spring:message code="engUnit.152"/></sst:option>
+  <sst:option value="128"><spring:message code="engUnit.128"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.force"/>">
-  <sst:option value="153"><fmt:message key="engUnit.153"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.force"/>">
+  <sst:option value="153"><spring:message code="engUnit.153"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.frequency"/>">
-  <sst:option value="25"><fmt:message key="engUnit.25"/></sst:option>
-  <sst:option value="26"><fmt:message key="engUnit.26"/></sst:option>
-  <sst:option value="27"><fmt:message key="engUnit.27"/></sst:option>
-  <sst:option value="129"><fmt:message key="engUnit.129"/></sst:option>
-  <sst:option value="130"><fmt:message key="engUnit.130"/></sst:option>
-  <sst:option value="131"><fmt:message key="engUnit.131"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.frequency"/>">
+  <sst:option value="25"><spring:message code="engUnit.25"/></sst:option>
+  <sst:option value="26"><spring:message code="engUnit.26"/></sst:option>
+  <sst:option value="27"><spring:message code="engUnit.27"/></sst:option>
+  <sst:option value="129"><spring:message code="engUnit.129"/></sst:option>
+  <sst:option value="130"><spring:message code="engUnit.130"/></sst:option>
+  <sst:option value="131"><spring:message code="engUnit.131"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.humidity"/>">
-  <sst:option value="28"><fmt:message key="engUnit.28"/></sst:option>
-  <sst:option value="29"><fmt:message key="engUnit.29"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.humidity"/>">
+  <sst:option value="28"><spring:message code="engUnit.28"/></sst:option>
+  <sst:option value="29"><spring:message code="engUnit.29"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.length"/>">
-  <sst:option value="30"><fmt:message key="engUnit.30"/></sst:option>
-  <sst:option value="118"><fmt:message key="engUnit.118"/></sst:option>
-  <sst:option value="31"><fmt:message key="engUnit.31"/></sst:option>
-  <sst:option value="32"><fmt:message key="engUnit.32"/></sst:option>
-  <sst:option value="33"><fmt:message key="engUnit.33"/></sst:option>
-  <sst:option value="190"><fmt:message key="engUnit.190"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.length"/>">
+  <sst:option value="30"><spring:message code="engUnit.30"/></sst:option>
+  <sst:option value="118"><spring:message code="engUnit.118"/></sst:option>
+  <sst:option value="31"><spring:message code="engUnit.31"/></sst:option>
+  <sst:option value="32"><spring:message code="engUnit.32"/></sst:option>
+  <sst:option value="33"><spring:message code="engUnit.33"/></sst:option>
+  <sst:option value="190"><spring:message code="engUnit.190"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.light"/>">
-  <sst:option value="179"><fmt:message key="engUnit.179"/></sst:option>
-  <sst:option value="180"><fmt:message key="engUnit.180"/></sst:option>
-  <sst:option value="34"><fmt:message key="engUnit.34"/></sst:option>
-  <sst:option value="35"><fmt:message key="engUnit.35"/></sst:option>
-  <sst:option value="36"><fmt:message key="engUnit.36"/></sst:option>
-  <sst:option value="37"><fmt:message key="engUnit.37"/></sst:option>
-  <sst:option value="38"><fmt:message key="engUnit.38"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.light"/>">
+  <sst:option value="179"><spring:message code="engUnit.179"/></sst:option>
+  <sst:option value="180"><spring:message code="engUnit.180"/></sst:option>
+  <sst:option value="34"><spring:message code="engUnit.34"/></sst:option>
+  <sst:option value="35"><spring:message code="engUnit.35"/></sst:option>
+  <sst:option value="36"><spring:message code="engUnit.36"/></sst:option>
+  <sst:option value="37"><spring:message code="engUnit.37"/></sst:option>
+  <sst:option value="38"><spring:message code="engUnit.38"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.mass"/>">
-  <sst:option value="39"><fmt:message key="engUnit.39"/></sst:option>
-  <sst:option value="40"><fmt:message key="engUnit.40"/></sst:option>
-  <sst:option value="41"><fmt:message key="engUnit.41"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.mass"/>">
+  <sst:option value="39"><spring:message code="engUnit.39"/></sst:option>
+  <sst:option value="40"><spring:message code="engUnit.40"/></sst:option>
+  <sst:option value="41"><spring:message code="engUnit.41"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.massFlow"/>">
-  <sst:option value="154"><fmt:message key="engUnit.154"/></sst:option>
-  <sst:option value="155"><fmt:message key="engUnit.155"/></sst:option>
-  <sst:option value="42"><fmt:message key="engUnit.42"/></sst:option>
-  <sst:option value="43"><fmt:message key="engUnit.43"/></sst:option>
-  <sst:option value="44"><fmt:message key="engUnit.44"/></sst:option>
-  <sst:option value="119"><fmt:message key="engUnit.119"/></sst:option>
-  <sst:option value="45"><fmt:message key="engUnit.45"/></sst:option>
-  <sst:option value="46"><fmt:message key="engUnit.46"/></sst:option>
-  <sst:option value="156"><fmt:message key="engUnit.156"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.massFlow"/>">
+  <sst:option value="154"><spring:message code="engUnit.154"/></sst:option>
+  <sst:option value="155"><spring:message code="engUnit.155"/></sst:option>
+  <sst:option value="42"><spring:message code="engUnit.42"/></sst:option>
+  <sst:option value="43"><spring:message code="engUnit.43"/></sst:option>
+  <sst:option value="44"><spring:message code="engUnit.44"/></sst:option>
+  <sst:option value="119"><spring:message code="engUnit.119"/></sst:option>
+  <sst:option value="45"><spring:message code="engUnit.45"/></sst:option>
+  <sst:option value="46"><spring:message code="engUnit.46"/></sst:option>
+  <sst:option value="156"><spring:message code="engUnit.156"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.power"/>">
-  <sst:option value="132"><fmt:message key="engUnit.132"/></sst:option>
-  <sst:option value="47"><fmt:message key="engUnit.47"/></sst:option>
-  <sst:option value="48"><fmt:message key="engUnit.48"/></sst:option>
-  <sst:option value="49"><fmt:message key="engUnit.49"/></sst:option>
-  <sst:option value="50"><fmt:message key="engUnit.50"/></sst:option>
-  <sst:option value="157"><fmt:message key="engUnit.157"/></sst:option>
-  <sst:option value="51"><fmt:message key="engUnit.51"/></sst:option>
-  <sst:option value="52"><fmt:message key="engUnit.52"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.power"/>">
+  <sst:option value="132"><spring:message code="engUnit.132"/></sst:option>
+  <sst:option value="47"><spring:message code="engUnit.47"/></sst:option>
+  <sst:option value="48"><spring:message code="engUnit.48"/></sst:option>
+  <sst:option value="49"><spring:message code="engUnit.49"/></sst:option>
+  <sst:option value="50"><spring:message code="engUnit.50"/></sst:option>
+  <sst:option value="157"><spring:message code="engUnit.157"/></sst:option>
+  <sst:option value="51"><spring:message code="engUnit.51"/></sst:option>
+  <sst:option value="52"><spring:message code="engUnit.52"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.pressure"/>">
-  <sst:option value="53"><fmt:message key="engUnit.53"/></sst:option>
-  <sst:option value="133"><fmt:message key="engUnit.133"/></sst:option>
-  <sst:option value="54"><fmt:message key="engUnit.54"/></sst:option>
-  <sst:option value="134"><fmt:message key="engUnit.134"/></sst:option>
-  <sst:option value="55"><fmt:message key="engUnit.55"/></sst:option>
-  <sst:option value="56"><fmt:message key="engUnit.56"/></sst:option>
-  <sst:option value="57"><fmt:message key="engUnit.57"/></sst:option>
-  <sst:option value="58"><fmt:message key="engUnit.58"/></sst:option>
-  <sst:option value="59"><fmt:message key="engUnit.59"/></sst:option>
-  <sst:option value="60"><fmt:message key="engUnit.60"/></sst:option>
-  <sst:option value="61"><fmt:message key="engUnit.61"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.pressure"/>">
+  <sst:option value="53"><spring:message code="engUnit.53"/></sst:option>
+  <sst:option value="133"><spring:message code="engUnit.133"/></sst:option>
+  <sst:option value="54"><spring:message code="engUnit.54"/></sst:option>
+  <sst:option value="134"><spring:message code="engUnit.134"/></sst:option>
+  <sst:option value="55"><spring:message code="engUnit.55"/></sst:option>
+  <sst:option value="56"><spring:message code="engUnit.56"/></sst:option>
+  <sst:option value="57"><spring:message code="engUnit.57"/></sst:option>
+  <sst:option value="58"><spring:message code="engUnit.58"/></sst:option>
+  <sst:option value="59"><spring:message code="engUnit.59"/></sst:option>
+  <sst:option value="60"><spring:message code="engUnit.60"/></sst:option>
+  <sst:option value="61"><spring:message code="engUnit.61"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.temperature"/>">
-  <sst:option value="62"><fmt:message key="engUnit.62"/></sst:option>
-  <sst:option value="63"><fmt:message key="engUnit.63"/></sst:option>
-  <sst:option value="181"><fmt:message key="engUnit.181"/></sst:option>
-  <sst:option value="182"><fmt:message key="engUnit.182"/></sst:option>
-  <sst:option value="64"><fmt:message key="engUnit.64"/></sst:option>
-  <sst:option value="65"><fmt:message key="engUnit.65"/></sst:option>
-  <sst:option value="66"><fmt:message key="engUnit.66"/></sst:option>
-  <sst:option value="120"><fmt:message key="engUnit.120"/></sst:option>
-  <sst:option value="121"><fmt:message key="engUnit.121"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.temperature"/>">
+  <sst:option value="62"><spring:message code="engUnit.62"/></sst:option>
+  <sst:option value="63"><spring:message code="engUnit.63"/></sst:option>
+  <sst:option value="181"><spring:message code="engUnit.181"/></sst:option>
+  <sst:option value="182"><spring:message code="engUnit.182"/></sst:option>
+  <sst:option value="64"><spring:message code="engUnit.64"/></sst:option>
+  <sst:option value="65"><spring:message code="engUnit.65"/></sst:option>
+  <sst:option value="66"><spring:message code="engUnit.66"/></sst:option>
+  <sst:option value="120"><spring:message code="engUnit.120"/></sst:option>
+  <sst:option value="121"><spring:message code="engUnit.121"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.time"/>">
-  <sst:option value="67"><fmt:message key="engUnit.67"/></sst:option>
-  <sst:option value="68"><fmt:message key="engUnit.68"/></sst:option>
-  <sst:option value="69"><fmt:message key="engUnit.69"/></sst:option>
-  <sst:option value="70"><fmt:message key="engUnit.70"/></sst:option>
-  <sst:option value="71"><fmt:message key="engUnit.71"/></sst:option>
-  <sst:option value="72"><fmt:message key="engUnit.72"/></sst:option>
-  <sst:option value="73"><fmt:message key="engUnit.73"/></sst:option>
-  <sst:option value="158"><fmt:message key="engUnit.158"/></sst:option>
-  <sst:option value="159"><fmt:message key="engUnit.159"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.time"/>">
+  <sst:option value="67"><spring:message code="engUnit.67"/></sst:option>
+  <sst:option value="68"><spring:message code="engUnit.68"/></sst:option>
+  <sst:option value="69"><spring:message code="engUnit.69"/></sst:option>
+  <sst:option value="70"><spring:message code="engUnit.70"/></sst:option>
+  <sst:option value="71"><spring:message code="engUnit.71"/></sst:option>
+  <sst:option value="72"><spring:message code="engUnit.72"/></sst:option>
+  <sst:option value="73"><spring:message code="engUnit.73"/></sst:option>
+  <sst:option value="158"><spring:message code="engUnit.158"/></sst:option>
+  <sst:option value="159"><spring:message code="engUnit.159"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.torque"/>">
-  <sst:option value="160"><fmt:message key="engUnit.160"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.torque"/>">
+  <sst:option value="160"><spring:message code="engUnit.160"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.velocity"/>">
-  <sst:option value="161"><fmt:message key="engUnit.161"/></sst:option>
-  <sst:option value="162"><fmt:message key="engUnit.162"/></sst:option>
-  <sst:option value="74"><fmt:message key="engUnit.74"/></sst:option>
-  <sst:option value="163"><fmt:message key="engUnit.163"/></sst:option>
-  <sst:option value="164"><fmt:message key="engUnit.164"/></sst:option>
-  <sst:option value="165"><fmt:message key="engUnit.165"/></sst:option>
-  <sst:option value="76"><fmt:message key="engUnit.76"/></sst:option>
-  <sst:option value="77"><fmt:message key="engUnit.77"/></sst:option>
-  <sst:option value="78"><fmt:message key="engUnit.78"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.velocity"/>">
+  <sst:option value="161"><spring:message code="engUnit.161"/></sst:option>
+  <sst:option value="162"><spring:message code="engUnit.162"/></sst:option>
+  <sst:option value="74"><spring:message code="engUnit.74"/></sst:option>
+  <sst:option value="163"><spring:message code="engUnit.163"/></sst:option>
+  <sst:option value="164"><spring:message code="engUnit.164"/></sst:option>
+  <sst:option value="165"><spring:message code="engUnit.165"/></sst:option>
+  <sst:option value="76"><spring:message code="engUnit.76"/></sst:option>
+  <sst:option value="77"><spring:message code="engUnit.77"/></sst:option>
+  <sst:option value="78"><spring:message code="engUnit.78"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.volume"/>">
-  <sst:option value="79"><fmt:message key="engUnit.79"/></sst:option>
-  <sst:option value="80"><fmt:message key="engUnit.80"/></sst:option>
-  <sst:option value="81"><fmt:message key="engUnit.81"/></sst:option>
-  <sst:option value="82"><fmt:message key="engUnit.82"/></sst:option>
-  <sst:option value="83"><fmt:message key="engUnit.83"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.volume"/>">
+  <sst:option value="79"><spring:message code="engUnit.79"/></sst:option>
+  <sst:option value="80"><spring:message code="engUnit.80"/></sst:option>
+  <sst:option value="81"><spring:message code="engUnit.81"/></sst:option>
+  <sst:option value="82"><spring:message code="engUnit.82"/></sst:option>
+  <sst:option value="83"><spring:message code="engUnit.83"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.volumetricFlow"/>">
-  <sst:option value="142"><fmt:message key="engUnit.142"/></sst:option>
-  <sst:option value="84"><fmt:message key="engUnit.84"/></sst:option>
-  <sst:option value="85"><fmt:message key="engUnit.85"/></sst:option>
-  <sst:option value="165"><fmt:message key="engUnit.165"/></sst:option>
-  <sst:option value="135"><fmt:message key="engUnit.135"/></sst:option>
-  <sst:option value="86"><fmt:message key="engUnit.86"/></sst:option>
-  <sst:option value="87"><fmt:message key="engUnit.87"/></sst:option>
-  <sst:option value="88"><fmt:message key="engUnit.88"/></sst:option>
-  <sst:option value="136"><fmt:message key="engUnit.136"/></sst:option>
-  <sst:option value="89"><fmt:message key="engUnit.89"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.volumetricFlow"/>">
+  <sst:option value="142"><spring:message code="engUnit.142"/></sst:option>
+  <sst:option value="84"><spring:message code="engUnit.84"/></sst:option>
+  <sst:option value="85"><spring:message code="engUnit.85"/></sst:option>
+  <sst:option value="165"><spring:message code="engUnit.165"/></sst:option>
+  <sst:option value="135"><spring:message code="engUnit.135"/></sst:option>
+  <sst:option value="86"><spring:message code="engUnit.86"/></sst:option>
+  <sst:option value="87"><spring:message code="engUnit.87"/></sst:option>
+  <sst:option value="88"><spring:message code="engUnit.88"/></sst:option>
+  <sst:option value="136"><spring:message code="engUnit.136"/></sst:option>
+  <sst:option value="89"><spring:message code="engUnit.89"/></sst:option>
 </optgroup>
-<optgroup label="<fmt:message key="engUnitGroup.other"/>">
-  <sst:option value="90"><fmt:message key="engUnit.90"/></sst:option>
-  <sst:option value="91"><fmt:message key="engUnit.91"/></sst:option>
-  <sst:option value="92"><fmt:message key="engUnit.92"/></sst:option>
-  <sst:option value="93"><fmt:message key="engUnit.93"/></sst:option>
-  <sst:option value="94"><fmt:message key="engUnit.94"/></sst:option>
-  <sst:option value="183"><fmt:message key="engUnit.183"/></sst:option>
-  <sst:option value="186"><fmt:message key="engUnit.186"/></sst:option>
-  <sst:option value="137"><fmt:message key="engUnit.137"/></sst:option>
-  <sst:option value="138"><fmt:message key="engUnit.138"/></sst:option>
-  <sst:option value="139"><fmt:message key="engUnit.139"/></sst:option>
-  <sst:option value="140"><fmt:message key="engUnit.140"/></sst:option>
-  <sst:option value="95"><fmt:message key="engUnit.95"/></sst:option>
-  <sst:option value="187"><fmt:message key="engUnit.187"/></sst:option>
-  <sst:option value="188"><fmt:message key="engUnit.188"/></sst:option>
-  <sst:option value="96"><fmt:message key="engUnit.96"/></sst:option>
-  <sst:option value="97"><fmt:message key="engUnit.97"/></sst:option>
-  <sst:option value="98"><fmt:message key="engUnit.98"/></sst:option>
-  <sst:option value="143"><fmt:message key="engUnit.143"/></sst:option>
-  <sst:option value="144"><fmt:message key="engUnit.144"/></sst:option>
-  <sst:option value="99"><fmt:message key="engUnit.99"/></sst:option>
-  <sst:option value="100"><fmt:message key="engUnit.100"/></sst:option>
-  <sst:option value="101"><fmt:message key="engUnit.101"/></sst:option>
-  <sst:option value="102"><fmt:message key="engUnit.102"/></sst:option>
-  <sst:option value="103"><fmt:message key="engUnit.103"/></sst:option>
-  <sst:option value="184"><fmt:message key="engUnit.184"/></sst:option>
-  <sst:option value="104"><fmt:message key="engUnit.104"/></sst:option>
-  <sst:option value="185"><fmt:message key="engUnit.185"/></sst:option>
-  <sst:option value="189"><fmt:message key="engUnit.189"/></sst:option>
-  <sst:option value="141"><fmt:message key="engUnit.141"/></sst:option>
+<optgroup label="<spring:message code="engUnitGroup.other"/>">
+  <sst:option value="90"><spring:message code="engUnit.90"/></sst:option>
+  <sst:option value="91"><spring:message code="engUnit.91"/></sst:option>
+  <sst:option value="92"><spring:message code="engUnit.92"/></sst:option>
+  <sst:option value="93"><spring:message code="engUnit.93"/></sst:option>
+  <sst:option value="94"><spring:message code="engUnit.94"/></sst:option>
+  <sst:option value="183"><spring:message code="engUnit.183"/></sst:option>
+  <sst:option value="186"><spring:message code="engUnit.186"/></sst:option>
+  <sst:option value="137"><spring:message code="engUnit.137"/></sst:option>
+  <sst:option value="138"><spring:message code="engUnit.138"/></sst:option>
+  <sst:option value="139"><spring:message code="engUnit.139"/></sst:option>
+  <sst:option value="140"><spring:message code="engUnit.140"/></sst:option>
+  <sst:option value="95"><spring:message code="engUnit.95"/></sst:option>
+  <sst:option value="187"><spring:message code="engUnit.187"/></sst:option>
+  <sst:option value="188"><spring:message code="engUnit.188"/></sst:option>
+  <sst:option value="96"><spring:message code="engUnit.96"/></sst:option>
+  <sst:option value="97"><spring:message code="engUnit.97"/></sst:option>
+  <sst:option value="98"><spring:message code="engUnit.98"/></sst:option>
+  <sst:option value="143"><spring:message code="engUnit.143"/></sst:option>
+  <sst:option value="144"><spring:message code="engUnit.144"/></sst:option>
+  <sst:option value="99"><spring:message code="engUnit.99"/></sst:option>
+  <sst:option value="100"><spring:message code="engUnit.100"/></sst:option>
+  <sst:option value="101"><spring:message code="engUnit.101"/></sst:option>
+  <sst:option value="102"><spring:message code="engUnit.102"/></sst:option>
+  <sst:option value="103"><spring:message code="engUnit.103"/></sst:option>
+  <sst:option value="184"><spring:message code="engUnit.184"/></sst:option>
+  <sst:option value="104"><spring:message code="engUnit.104"/></sst:option>
+  <sst:option value="185"><spring:message code="engUnit.185"/></sst:option>
+  <sst:option value="189"><spring:message code="engUnit.189"/></sst:option>
+  <sst:option value="141"><spring:message code="engUnit.141"/></sst:option>
 </optgroup>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/enhancedImageChartConfig.tag b/WebContent/WEB-INF/tags/enhancedImageChartConfig.tag
index 3063234ec9..44d2c7e291 100644
--- a/WebContent/WEB-INF/tags/enhancedImageChartConfig.tag
+++ b/WebContent/WEB-INF/tags/enhancedImageChartConfig.tag
@@ -2,37 +2,37 @@
 <%@ tag body-content="empty"%>
 <%@attribute name="componentId" required="true" %>
 <div id="c${componentId}ConfigButtonDiv">
-	<button onclick="dygraphsCharts['${componentId}'].showConfiguration()"><fmt:message key="graphic.enhancedImageChart.config"></fmt:message></button>
+	<button onclick="dygraphsCharts['${componentId}'].showConfiguration()"><spring:message code="graphic.enhancedImageChart.config"></spring:message></button>
 </div>
 <div id="c${componentId}Config" class="enhancedImageChartConfig">
 	<div>
-		<h3 style="float: left;"><fmt:message key="graphic.enhancedImageChart.config.title"/></h3>
+		<h3 style="float: left;"><spring:message code="graphic.enhancedImageChart.config.title"/></h3>
 		<tag:img png="cross" onclick="jQuery('#c${componentId}Config').hide()" title="common.close" style="display: inline; float: right; margin-top: 13px;"/>
 	</div>
 	<div>
 		<form>
 			<div>
-				<b><fmt:message key="graphic.enhancedImageChart.config.axes.ranges"/></b>
+				<b><spring:message code="graphic.enhancedImageChart.config.axes.ranges"/></b>
 				<div class="margin2">
-					<label for="c${componentId}_yRangeMin"><fmt:message key="graphic.enhancedImageChart.config.y.min"/></label><input id="c${componentId}_yRangeMin" type="text" size="8"/><br/>
-					<label for="c${componentId}_yRangeMax"><fmt:message key="graphic.enhancedImageChart.config.y.max"/></label><input id="c${componentId}_yRangeMax" type="text" size="8"/>
+					<label for="c${componentId}_yRangeMin"><spring:message code="graphic.enhancedImageChart.config.y.min"/></label><input id="c${componentId}_yRangeMin" type="text" size="8"/><br/>
+					<label for="c${componentId}_yRangeMax"><spring:message code="graphic.enhancedImageChart.config.y.max"/></label><input id="c${componentId}_yRangeMax" type="text" size="8"/>
 				</div>
-				<button id="c${componentId}_yRangeSet" type="button" onclick="dygraphsCharts['${componentId}'].setYRange()"><fmt:message key="graphic.enhancedImageChart.config.set"/></button><br/>
-				<button id="c${componentId}_yZoomIn" type="button" onclick="dygraphsCharts['${componentId}'].zoomInGraphY()"><fmt:message key="graphic.enhancedImageChart.config.zoomIn"/></button>
-				<button id="c${componentId}_yZoomOut" type="button" onclick="dygraphsCharts['${componentId}'].zoomOutGraphY()"><fmt:message key="graphic.enhancedImageChart.config.zoomOut"/></button><br/>
+				<button id="c${componentId}_yRangeSet" type="button" onclick="dygraphsCharts['${componentId}'].setYRange()"><spring:message code="graphic.enhancedImageChart.config.set"/></button><br/>
+				<button id="c${componentId}_yZoomIn" type="button" onclick="dygraphsCharts['${componentId}'].zoomInGraphY()"><spring:message code="graphic.enhancedImageChart.config.zoomIn"/></button>
+				<button id="c${componentId}_yZoomOut" type="button" onclick="dygraphsCharts['${componentId}'].zoomOutGraphY()"><spring:message code="graphic.enhancedImageChart.config.zoomOut"/></button><br/>
 				<div class="margin2">
-					<label for="c${componentId}_xRangeMin"><fmt:message key="graphic.enhancedImageChart.config.x.min"/></label><input id="c${componentId}_xRangeMin" type="text" size="18"/><br/>
-					<label for="c${componentId}_xRangeMax"><fmt:message key="graphic.enhancedImageChart.config.x.max"/></label><input id="c${componentId}_xRangeMax" type="text" size="18"/>
+					<label for="c${componentId}_xRangeMin"><spring:message code="graphic.enhancedImageChart.config.x.min"/></label><input id="c${componentId}_xRangeMin" type="text" size="18"/><br/>
+					<label for="c${componentId}_xRangeMax"><spring:message code="graphic.enhancedImageChart.config.x.max"/></label><input id="c${componentId}_xRangeMax" type="text" size="18"/>
 				</div>
-				<button id="c${componentId}_xRangeSet" type="button" onclick="dygraphsCharts['${componentId}'].setXRange()"><fmt:message key="graphic.enhancedImageChart.config.set"/></button><br/>
-				<button id="c${componentId}_xZoomIn" type="button" onclick="dygraphsCharts['${componentId}'].zoomInGraphX()"><fmt:message key="graphic.enhancedImageChart.config.zoomIn"/></button>
-				<button id="c${componentId}_xZoomOut" type="button" onclick="dygraphsCharts['${componentId}'].zoomOutGraphX()"><fmt:message key="graphic.enhancedImageChart.config.zoomOut"/></button><br/>
+				<button id="c${componentId}_xRangeSet" type="button" onclick="dygraphsCharts['${componentId}'].setXRange()"><spring:message code="graphic.enhancedImageChart.config.set"/></button><br/>
+				<button id="c${componentId}_xZoomIn" type="button" onclick="dygraphsCharts['${componentId}'].zoomInGraphX()"><spring:message code="graphic.enhancedImageChart.config.zoomIn"/></button>
+				<button id="c${componentId}_xZoomOut" type="button" onclick="dygraphsCharts['${componentId}'].zoomOutGraphX()"><spring:message code="graphic.enhancedImageChart.config.zoomOut"/></button><br/>
 			</div>
 			<div class="margin1">
-				<b><fmt:message key="graphic.enhancedImageChart.config.export"/></b>
+				<b><spring:message code="graphic.enhancedImageChart.config.export"/></b>
 				<div class="margin2">
-					<button id="c${componentId}_PNGExport" type="button" onclick="dygraphsCharts['${componentId}'].exportAsImage()"><fmt:message key="graphic.enhancedImageChart.config.export.png"/></button>
-					<button id="c${componentId}_CSVExport" type="button" onclick="dygraphsCharts['${componentId}'].exportAsCSV()"><fmt:message key="graphic.enhancedImageChart.config.export.csv"/></button>
+					<button id="c${componentId}_PNGExport" type="button" onclick="dygraphsCharts['${componentId}'].exportAsImage()"><spring:message code="graphic.enhancedImageChart.config.export.png"/></button>
+					<button id="c${componentId}_CSVExport" type="button" onclick="dygraphsCharts['${componentId}'].exportAsCSV()"><spring:message code="graphic.enhancedImageChart.config.export.csv"/></button>
 				</div>
 			</div>
 		</form>
diff --git a/WebContent/WEB-INF/tags/enhancedImageChartPointConfig.tag b/WebContent/WEB-INF/tags/enhancedImageChartPointConfig.tag
index 8c449b0efc..f9f31e8bcb 100644
--- a/WebContent/WEB-INF/tags/enhancedImageChartPointConfig.tag
+++ b/WebContent/WEB-INF/tags/enhancedImageChartPointConfig.tag
@@ -9,12 +9,12 @@
 	<div>
 		<form>
 			<div>
-				<label for="c${componentId}_showPoints"><b><fmt:message key="graphic.enhancedImageChart.pointConfig.showPoints"/></b></label><input id="c${componentId}_showPoints" type="checkbox"/>
+				<label for="c${componentId}_showPoints"><b><spring:message code="graphic.enhancedImageChart.pointConfig.showPoints"/></b></label><input id="c${componentId}_showPoints" type="checkbox"/>
 			</div>
 			<div class="margin1">
-				<b><fmt:message key="graphic.enhancedImageChart.pointConfig.renderMode"/></b>
-				<input id="c${componentId}_renderModeLine" name="c${componentId}_renderMode" type="radio"/><label for="c${componentId}_renderModeLine"><fmt:message key="graphic.enhancedImageChart.pointConfig.renderMode.line"/></label>
-				<input id="c${componentId}_renderModeSpline" name="c${componentId}_renderMode" type="radio"/><label for="c${componentId}_renderModeSpline"><fmt:message key="graphic.enhancedImageChart.pointConfig.renderMode.spline"/></label>
+				<b><spring:message code="graphic.enhancedImageChart.pointConfig.renderMode"/></b>
+				<input id="c${componentId}_renderModeLine" name="c${componentId}_renderMode" type="radio"/><label for="c${componentId}_renderModeLine"><spring:message code="graphic.enhancedImageChart.pointConfig.renderMode.line"/></label>
+				<input id="c${componentId}_renderModeSpline" name="c${componentId}_renderMode" type="radio"/><label for="c${componentId}_renderModeSpline"><spring:message code="graphic.enhancedImageChart.pointConfig.renderMode.spline"/></label>
 			</div>
 		</form>
 	</div>
diff --git a/WebContent/WEB-INF/tags/enhancedImageChartSeriesConfig.tag b/WebContent/WEB-INF/tags/enhancedImageChartSeriesConfig.tag
index ed2c983e66..f85474df53 100644
--- a/WebContent/WEB-INF/tags/enhancedImageChartSeriesConfig.tag
+++ b/WebContent/WEB-INF/tags/enhancedImageChartSeriesConfig.tag
@@ -3,27 +3,27 @@
 <%@attribute name="vc" type="com.serotonin.mango.view.component.EnhancedImageChartComponent" required="true" rtexprvalue="true"%>
 <div id="c${vc.id}SeriesConfig" class="enhancedImageChartConfig">
 	<div>
-		<h3 style="float: left;"><fmt:message key="graphic.enhancedImageChart.seriesConfig"/></h3>
+		<h3 style="float: left;"><spring:message code="graphic.enhancedImageChart.seriesConfig"/></h3>
 		<tag:img png="cross" onclick="jQuery('#c${vc.id}SeriesConfig').hide()" title="common.close" style="display: inline; float: right; margin-top: 13px;"/>
 	</div>
 	<div>
 		<form>
 			<div>
-				<span><fmt:message key="graphic.enhancedImageChart.seriesConfig.visibility"/></span><br/>
+				<span><spring:message code="graphic.enhancedImageChart.seriesConfig.visibility"/></span><br/>
 				<c:forEach items="${vc.childComponents}" var="point">
 					<c:if test="${!empty point.viewComponent.extendedName}">
 						<c:set var="pointName">
 							<c:choose>
 								<c:when test="${!empty point.viewComponent.alias}">
-									${point.viewComponent.alias}
+									<c:out value="${point.viewComponent.alias}"/>
 								</c:when>
 								<c:otherwise>
-									${point.viewComponent.extendedName}
+									<c:out value="${point.viewComponent.extendedName}"/>
 								</c:otherwise>
 							</c:choose>
 						</c:set>
 						<input id="c${vc.id}${point.id}_visibility" type="checkbox" checked="checked" onchange="dygraphsCharts['${vc.id}'].changeVisibility('${pointName}', this.checked)"/>
-						<label for="c${vc.id}${point.id}_visibility">${pointName}</label><br/>
+						<label for="c${vc.id}${point.id}_visibility"><c:out value="${pointName}"/></label><br/>
 					</c:if>
 				</c:forEach>
 			</div>
@@ -32,22 +32,21 @@
 					<c:set var="pointName">
 						<c:choose>
 							<c:when test="${!empty point.viewComponent.alias}">
-								${point.viewComponent.alias}
+								<c:out value="${point.viewComponent.alias}"/>
 							</c:when>
 							<c:otherwise>
-								${point.viewComponent.extendedName}
+								<c:out value="${point.viewComponent.extendedName}"/>
 							</c:otherwise>
 						</c:choose>
 					</c:set>
 					<div>
 						<span>
-							<fmt:message key="graphic.enhancedImageChart.seriesConfig.seriesOptions">
-								<fmt:param>${pointName}</fmt:param>
-							</fmt:message>
+							<spring:message code="graphic.enhancedImageChart.seriesConfig.seriesOptions" arguments="${pointName}">
+					        </spring:message>
 						</span><br/>
-						<label for="c${vc.id}${point.id}_color" class="margin"><fmt:message key="graphic.enhancedImageChart.seriesConfig.seriesOptions.color"/></label>
+						<label for="c${vc.id}${point.id}_color" class="margin"><spring:message code="graphic.enhancedImageChart.seriesConfig.seriesOptions.color"/></label>
 						<input id="c${vc.id}${point.id}_color" type="hidden" value="${point.viewComponent.color}"/><br/>
-						<label for="c${vc.id}${point.id}_strokeWidth" class="margin"><fmt:message key="graphic.enhancedImageChart.seriesConfig.seriesOptions.strokeWidth"/></label>
+						<label for="c${vc.id}${point.id}_strokeWidth" class="margin"><spring:message code="graphic.enhancedImageChart.seriesConfig.seriesOptions.strokeWidth"/></label>
 						<input id="c${vc.id}${point.id}_strokeWidth" value="${point.viewComponent.strokeWidth}"/>
 						<br/>
 					</div>
diff --git a/WebContent/WEB-INF/tags/eventIcon.tag b/WebContent/WEB-INF/tags/eventIcon.tag
index fe015cebf8..33a197181f 100644
--- a/WebContent/WEB-INF/tags/eventIcon.tag
+++ b/WebContent/WEB-INF/tags/eventIcon.tag
@@ -33,5 +33,5 @@
   <c:when test="${event.alarmLevel == 3}"><tag:img png="flag_orange_off" title="common.alarmLevel.critical.rtn"/></c:when>
   <c:when test="${event.active && event.alarmLevel == 4}"><tag:img png="flag_red" title="common.alarmLevel.lifeSafety"/></c:when>
   <c:when test="${event.alarmLevel == 4}"><tag:img png="flag_red_off" title="common.alarmLevel.lifeSafety.rtn"/></c:when>
-  <c:otherwise>(<fmt:message key="common.alarmLevel.unknown"/> ${event.alarmLevel})</c:otherwise>
+  <c:otherwise>(<spring:message code="common.alarmLevel.unknown"/> ${event.alarmLevel})</c:otherwise>
 </c:choose>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/exportCodesOptions.tag b/WebContent/WEB-INF/tags/exportCodesOptions.tag
index 065da1ea92..2c80ef2cfb 100644
--- a/WebContent/WEB-INF/tags/exportCodesOptions.tag
+++ b/WebContent/WEB-INF/tags/exportCodesOptions.tag
@@ -21,7 +21,7 @@
 --%><%@attribute name="sst" type="java.lang.Boolean"%><%--
 --%><c:forEach items="${optionList}" var="option">
   <c:choose>
-    <c:when test="${sst}"><sst:option value="${option.key}"><fmt:message key="${option.value}"/></sst:option></c:when>
-    <c:otherwise><option value="${option.key}"><fmt:message key="${option.value}"/></option></c:otherwise>
+    <c:when test="${sst}"><sst:option value="${option.key}"><spring:message code="${option.value}"/></sst:option></c:when>
+    <c:otherwise><option value="${option.key}"><spring:message code="${option.value}"/></option></c:otherwise>
   </c:choose>
 </c:forEach>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/logo.tag b/WebContent/WEB-INF/tags/logo.tag
index b9f8cccabb..59f5186e4c 100644
--- a/WebContent/WEB-INF/tags/logo.tag
+++ b/WebContent/WEB-INF/tags/logo.tag
@@ -3,11 +3,21 @@
 <div class="logo-section">
     <div class="logo-section--title">
       <img id="logo" src="assets/logo.png" alt="Logo">
+
+        <div id="top-description-container">
+            <span id="top-description-prefix" class="custom-text">
+                <c:out value="${topDescriptionPrefix}"/>
+            </span>
+            <span id="top-description" class="custom-text">
+                <c:out value="${topDescription}"/>
+            </span>
+        </div>
+
       <c:if test="${(!empty scadaVersion) && scadaVersion.isShowVersionInfo()}">
         <c:if test="${!empty scadaVersion.getCompanyName()}">
         <div id="company-container">
             <span>
-                <fmt:message key="logo.for"/>
+                <spring:message code="logo.for"/>
             </span>
             <span id="company-name">
                 ${scadaVersion.getCompanyName()}
@@ -21,7 +31,7 @@
       <div class="logo-section--details">
       <c:if test="${!empty scadaVersion.getPoweredBy()}">
         <span id="powered-by">
-            <fmt:message key="logo.powered"/>
+            <spring:message code="logo.powered"/>
             ${scadaVersion.getPoweredBy()}
         </span>
       </c:if>
diff --git a/WebContent/WEB-INF/tags/menuItem.tag b/WebContent/WEB-INF/tags/menuItem.tag
index 8ee11ef673..dbbde7e341 100644
--- a/WebContent/WEB-INF/tags/menuItem.tag
+++ b/WebContent/WEB-INF/tags/menuItem.tag
@@ -20,6 +20,6 @@
 --%><%@attribute name="href" required="true"%><%--
 --%><%@attribute name="png" required="true"%><%--
 --%><%@attribute name="key" required="true"%><%--
---%><c:set var="text"><fmt:message key="${key}"/></c:set><%--
+--%><c:set var="text"><spring:message code="${key}"/></c:set><%--
 --%><a href="${href}"><tag:img png="${png}" onmouseout="if (typeof hMD == 'function') hMD();"
         onmouseover="if (typeof hMD == 'function') hMD('${text}', this);"/></a>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/mobile/page.tag b/WebContent/WEB-INF/tags/mobile/page.tag
index 1d902e9165..94ddbeb1f4 100644
--- a/WebContent/WEB-INF/tags/mobile/page.tag
+++ b/WebContent/WEB-INF/tags/mobile/page.tag
@@ -21,7 +21,7 @@
 
 <html>
 <head>
-  <title><fmt:message key="header.title"/></title>
+  <title><spring:message code="header.title"/></title>
   <meta http-equiv="content-type" content="application/xhtml+xml;charset=utf-8"/>
   <link href="resources/mobile.css" type="text/css" rel="stylesheet"/>
 </head>
@@ -32,7 +32,7 @@
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
   <tr>
-    <td class="footer" align="center">&copy;2016<fmt:message key="footer.rightsReserved"/></td>
+    <td class="footer" align="center">&copy;2016<spring:message code="footer.rightsReserved"/></td>
   </tr>
 </table>
 
diff --git a/WebContent/WEB-INF/tags/monthOptions.tag b/WebContent/WEB-INF/tags/monthOptions.tag
index a01cec88eb..76694d02ec 100644
--- a/WebContent/WEB-INF/tags/monthOptions.tag
+++ b/WebContent/WEB-INF/tags/monthOptions.tag
@@ -21,31 +21,31 @@
 --%><%@attribute name="sst" type="java.lang.Boolean"%>
 <c:choose>
   <c:when test="${sst}">
-    <sst:option value="<%= Integer.toString(DateTimeConstants.JANUARY) %>"><fmt:message key="common.month.jan"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.FEBRUARY) %>"><fmt:message key="common.month.feb"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.MARCH) %>"><fmt:message key="common.month.mar"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.APRIL) %>"><fmt:message key="common.month.apr"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.MAY) %>"><fmt:message key="common.month.may"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.JUNE) %>"><fmt:message key="common.month.jun"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.JULY) %>"><fmt:message key="common.month.jul"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.AUGUST) %>"><fmt:message key="common.month.aug"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.SEPTEMBER) %>"><fmt:message key="common.month.sep"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.OCTOBER) %>"><fmt:message key="common.month.oct"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.NOVEMBER) %>"><fmt:message key="common.month.nov"/></sst:option>
-    <sst:option value="<%= Integer.toString(DateTimeConstants.DECEMBER) %>"><fmt:message key="common.month.dec"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.JANUARY) %>"><spring:message code="common.month.jan"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.FEBRUARY) %>"><spring:message code="common.month.feb"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.MARCH) %>"><spring:message code="common.month.mar"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.APRIL) %>"><spring:message code="common.month.apr"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.MAY) %>"><spring:message code="common.month.may"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.JUNE) %>"><spring:message code="common.month.jun"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.JULY) %>"><spring:message code="common.month.jul"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.AUGUST) %>"><spring:message code="common.month.aug"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.SEPTEMBER) %>"><spring:message code="common.month.sep"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.OCTOBER) %>"><spring:message code="common.month.oct"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.NOVEMBER) %>"><spring:message code="common.month.nov"/></sst:option>
+    <sst:option value="<%= Integer.toString(DateTimeConstants.DECEMBER) %>"><spring:message code="common.month.dec"/></sst:option>
   </c:when>
   <c:otherwise>
-    <option value="<%= DateTimeConstants.JANUARY %>"><fmt:message key="common.month.jan"/></option>
-    <option value="<%= DateTimeConstants.FEBRUARY %>"><fmt:message key="common.month.feb"/></option>
-    <option value="<%= DateTimeConstants.MARCH %>"><fmt:message key="common.month.mar"/></option>
-    <option value="<%= DateTimeConstants.APRIL %>"><fmt:message key="common.month.apr"/></option>
-    <option value="<%= DateTimeConstants.MAY %>"><fmt:message key="common.month.may"/></option>
-    <option value="<%= DateTimeConstants.JUNE %>"><fmt:message key="common.month.jun"/></option>
-    <option value="<%= DateTimeConstants.JULY %>"><fmt:message key="common.month.jul"/></option>
-    <option value="<%= DateTimeConstants.AUGUST %>"><fmt:message key="common.month.aug"/></option>
-    <option value="<%= DateTimeConstants.SEPTEMBER %>"><fmt:message key="common.month.sep"/></option>
-    <option value="<%= DateTimeConstants.OCTOBER %>"><fmt:message key="common.month.oct"/></option>
-    <option value="<%= DateTimeConstants.NOVEMBER %>"><fmt:message key="common.month.nov"/></option>
-    <option value="<%= DateTimeConstants.DECEMBER %>"><fmt:message key="common.month.dec"/></option>
+    <option value="<%= DateTimeConstants.JANUARY %>"><spring:message code="common.month.jan"/></option>
+    <option value="<%= DateTimeConstants.FEBRUARY %>"><spring:message code="common.month.feb"/></option>
+    <option value="<%= DateTimeConstants.MARCH %>"><spring:message code="common.month.mar"/></option>
+    <option value="<%= DateTimeConstants.APRIL %>"><spring:message code="common.month.apr"/></option>
+    <option value="<%= DateTimeConstants.MAY %>"><spring:message code="common.month.may"/></option>
+    <option value="<%= DateTimeConstants.JUNE %>"><spring:message code="common.month.jun"/></option>
+    <option value="<%= DateTimeConstants.JULY %>"><spring:message code="common.month.jul"/></option>
+    <option value="<%= DateTimeConstants.AUGUST %>"><spring:message code="common.month.aug"/></option>
+    <option value="<%= DateTimeConstants.SEPTEMBER %>"><spring:message code="common.month.sep"/></option>
+    <option value="<%= DateTimeConstants.OCTOBER %>"><spring:message code="common.month.oct"/></option>
+    <option value="<%= DateTimeConstants.NOVEMBER %>"><spring:message code="common.month.nov"/></option>
+    <option value="<%= DateTimeConstants.DECEMBER %>"><spring:message code="common.month.dec"/></option>
   </c:otherwise>
 </c:choose>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/newPageNotification.tag b/WebContent/WEB-INF/tags/newPageNotification.tag
index dde8d573fc..c4d60a8c2c 100644
--- a/WebContent/WEB-INF/tags/newPageNotification.tag
+++ b/WebContent/WEB-INF/tags/newPageNotification.tag
@@ -10,11 +10,11 @@
     </div>
     <div class="content">
         <div class="message">
-            <fmt:message key="notification.newui.title"/>
+            <spring:message code="notification.newui.title"/>
         </div>
         <div class="actions">
-            <a href="${href}"><fmt:message key="notification.newui.move"/></a>
-            <a onclick="dontShowAgain()"><fmt:message key="notification.newui.dontshow"/></a>
+            <a href="${href}"><spring:message code="notification.newui.move"/></a>
+            <a onclick="dontShowAgain()"><spring:message code="notification.newui.dontshow"/></a>
         </div>
     </div>
 
diff --git a/WebContent/WEB-INF/tags/page.tag b/WebContent/WEB-INF/tags/page.tag
index 01107b72d9..6c28a5b385 100644
--- a/WebContent/WEB-INF/tags/page.tag
+++ b/WebContent/WEB-INF/tags/page.tag
@@ -31,7 +31,7 @@
 <head>
   <title><c:choose>
     <c:when test="${!empty instanceDescriptionHeader}">${instanceDescriptionHeader}</c:when>
-    <c:otherwise><fmt:message key="header.title"/></c:otherwise>
+    <c:otherwise><spring:message code="header.title"/></c:otherwise>
   </c:choose></title>
 
   <!-- Meta -->
@@ -164,13 +164,13 @@
             if (alarmLevel == 0)
                 textNode.innerHTML = "";
             else if (alarmLevel == 1)
-                textNode.innerHTML = '<fmt:message key="common.alarmLevel.info"/>';
+                textNode.innerHTML = '<spring:message code="common.alarmLevel.info"/>';
             else if (alarmLevel == 2)
-                textNode.innerHTML = '<fmt:message key="common.alarmLevel.urgent"/>';
+                textNode.innerHTML = '<spring:message code="common.alarmLevel.urgent"/>';
             else if (alarmLevel == 3)
-                textNode.innerHTML = '<fmt:message key="common.alarmLevel.critical"/>';
+                textNode.innerHTML = '<spring:message code="common.alarmLevel.critical"/>';
             else if (alarmLevel == 4)
-                textNode.innerHTML = '<fmt:message key="common.alarmLevel.lifeSafety"/>';
+                textNode.innerHTML = '<spring:message code="common.alarmLevel.lifeSafety"/>';
             else
                 textNode.innerHTML = "Unknown: "+ alarmLevel;
         }
@@ -323,7 +323,7 @@
   <div class="flex-default">
     <div id="navbarUserInfo">
       <c:if test="${isLoggedToScadaUser}">
-        <span class="copyTitle"><fmt:message key="header.user"/>:</span>
+        <span class="copyTitle"><spring:message code="header.user"/>:</span>
         <c:choose>
             <c:when test="${!empty sessionUser.firstName}">
               <span class="userName"><c:out value="${sessionUser.firstName} ${sessionUser.lastName}"/></span>
@@ -362,7 +362,7 @@
   <jsp:doBody/>
 </div>
 <div id="sltsFooter" class="footer">
-    <span>&copy;2012-${toYear} Scada-LTS <fmt:message key="footer.rightsReserved"/><span>
+    <span>&copy;2012-${toYear} Scada-LTS <spring:message code="footer.rightsReserved"/><span>
 </div>
 
 <c:if test="${!!sessionUser.hideHeader}">
diff --git a/WebContent/WEB-INF/tags/pointComponent.tag b/WebContent/WEB-INF/tags/pointComponent.tag
index fbba850231..940959daea 100644
--- a/WebContent/WEB-INF/tags/pointComponent.tag
+++ b/WebContent/WEB-INF/tags/pointComponent.tag
@@ -58,7 +58,7 @@
       <div style="position:absolute;left:-16px;top:0px;z-index:${vc.z+1};">
         <div id="c${vc.id}Warning" style="display:none;" onmouseover="showMenu('c${vc.id}Messages', 16, 0);"
                 onmouseout="hideLayer('c${vc.id}Messages');">
-          	  <tag:img png="warn" title="common.warning"/>
+          	  <div id="c${vc.id}WarningIcon"></div>
           <div id="c${vc.id}Messages" onmouseout="hideLayer(this);" class="controlContent"></div>
         </div>
         <div id="c${vc.id}Changing" style="display:none;"><tag:img png="icon_edit" title="common.settingValue"/></div>
diff --git a/WebContent/WEB-INF/tags/pointList.tag b/WebContent/WEB-INF/tags/pointList.tag
index f52be0c7ac..a4d73eb38e 100644
--- a/WebContent/WEB-INF/tags/pointList.tag
+++ b/WebContent/WEB-INF/tags/pointList.tag
@@ -27,7 +27,7 @@
       <div class="borderDiv marR marB">
         <table width="100%">
           <tr>
-            <td class="smallTitle"><fmt:message key="dsEdit.points.points"/></td>
+            <td class="smallTitle"><spring:message code="dsEdit.points.points"/></td>
             <td align="right">
             <tag:img id="enableAllImg" png="icon_ds_go"
                       onclick="enableAllPoints()" title="common.enableAll" style="margin-right:10px;"/>
@@ -48,7 +48,7 @@
         <table width="100%">
           <tr>
             <td>
-              <span class="smallTitle"><fmt:message key="dsEdit.points.details"/></span>
+              <span class="smallTitle"><spring:message code="dsEdit.points.details"/></span>
               <tag:help id="${pointHelpId}"/>
             </td>
             <td align="right">
@@ -61,11 +61,11 @@
 
         <table>
           <tr>
-            <td class="formLabelRequired"><fmt:message key="dsEdit.points.name"/></td>
+            <td class="formLabelRequired"><spring:message code="dsEdit.points.name"/></td>
             <td class="formField" style="width:100%;"><input style="width:90%;" type="text" id="name"/></td>
           </tr>
           <tr>
-            <td class="formLabelRequired"><fmt:message key="common.xid"/></td>
+            <td class="formLabelRequired"><spring:message code="common.xid"/></td>
             <td class="formField" style="width:100%;"><input style="width:90%;" type="text" id="xid"/></td>
           </tr>
           
diff --git a/WebContent/WEB-INF/tags/relinquish.tag b/WebContent/WEB-INF/tags/relinquish.tag
index b3f96193ff..89a828639e 100644
--- a/WebContent/WEB-INF/tags/relinquish.tag
+++ b/WebContent/WEB-INF/tags/relinquish.tag
@@ -18,5 +18,5 @@
 --%><%@include file="/WEB-INF/tags/decl.tagf"%><%--
 --%><%@tag body-content="empty"%><%--
 --%><c:if test="${point.pointLocator.relinquishable}"><%--
-  --%><a href="#" onclick="mango.view.setPoint(${point.id}, '${componentId}', null); return false;"><fmt:message key="common.relinquish"/></a><%--
+  --%><a href="#" onclick="mango.view.setPoint(${point.id}, '${componentId}', null); return false;"><spring:message code="common.relinquish"/></a><%--
 --%></c:if>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/sharedUsers.tag b/WebContent/WEB-INF/tags/sharedUsers.tag
index 6c672471a2..830cccc450 100644
--- a/WebContent/WEB-INF/tags/sharedUsers.tag
+++ b/WebContent/WEB-INF/tags/sharedUsers.tag
@@ -24,7 +24,7 @@
   <tr>
     <td>
       <tag:img png="user" title="share.sharing"/>
-      <span class="smallTitle"><fmt:message key="share.sharing"/></span>
+      <span class="smallTitle"><spring:message code="share.sharing"/></span>
       <tag:help id="${doxId}"/>
     </td>
     <td align="right">
@@ -45,12 +45,12 @@
     <td colspan="2">
       <table cellspacing="1">
         <tbody id="sharedUsersTableEmpty" style="display:none;">
-          <tr><th colspan="3"><fmt:message key="${noUsersKey}"/></th></tr>
+          <tr><th colspan="3"><spring:message code="${noUsersKey}"/></th></tr>
         </tbody>
         <tbody id="sharedUsersTableHeaders" style="display:none;">
           <tr class="smRowHeader">
-            <td><fmt:message key="share.userName"/></td>
-            <td><fmt:message key="share.accessType"/></td>
+            <td><spring:message code="share.userName"/></td>
+            <td><spring:message code="share.accessType"/></td>
             <td></td>
           </tr>
         </tbody>
diff --git a/WebContent/WEB-INF/tags/timePeriodOptions.tag b/WebContent/WEB-INF/tags/timePeriodOptions.tag
index 58ef6a24a2..768ceed30d 100644
--- a/WebContent/WEB-INF/tags/timePeriodOptions.tag
+++ b/WebContent/WEB-INF/tags/timePeriodOptions.tag
@@ -32,48 +32,48 @@
   <c:when test="${sst}">
     <c:choose>
       <c:when test="${singular}">
-        <c:if test="${ms}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MILLISECONDS) %>"><fmt:message key="common.tp.millisecond"/></sst:option></c:if>
-        <c:if test="${s}"><sst:option value="<%= Integer.toString(Common.TimePeriods.SECONDS) %>"><fmt:message key="common.tp.second"/></sst:option></c:if>
-        <c:if test="${min}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MINUTES) %>"><fmt:message key="common.tp.minute"/></sst:option></c:if>
-        <c:if test="${h}"><sst:option value="<%= Integer.toString(Common.TimePeriods.HOURS) %>"><fmt:message key="common.tp.hour"/></sst:option></c:if>
-        <c:if test="${d}"><sst:option value="<%= Integer.toString(Common.TimePeriods.DAYS) %>"><fmt:message key="common.tp.day"/></sst:option></c:if>
-        <c:if test="${w}"><sst:option value="<%= Integer.toString(Common.TimePeriods.WEEKS) %>"><fmt:message key="common.tp.week"/></sst:option></c:if>
-        <c:if test="${mon}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MONTHS) %>"><fmt:message key="common.tp.month"/></sst:option></c:if>
-        <c:if test="${y}"><sst:option value="<%= Integer.toString(Common.TimePeriods.YEARS) %>"><fmt:message key="common.tp.year"/></sst:option></c:if>
+        <c:if test="${ms}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MILLISECONDS) %>"><spring:message code="common.tp.millisecond"/></sst:option></c:if>
+        <c:if test="${s}"><sst:option value="<%= Integer.toString(Common.TimePeriods.SECONDS) %>"><spring:message code="common.tp.second"/></sst:option></c:if>
+        <c:if test="${min}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MINUTES) %>"><spring:message code="common.tp.minute"/></sst:option></c:if>
+        <c:if test="${h}"><sst:option value="<%= Integer.toString(Common.TimePeriods.HOURS) %>"><spring:message code="common.tp.hour"/></sst:option></c:if>
+        <c:if test="${d}"><sst:option value="<%= Integer.toString(Common.TimePeriods.DAYS) %>"><spring:message code="common.tp.day"/></sst:option></c:if>
+        <c:if test="${w}"><sst:option value="<%= Integer.toString(Common.TimePeriods.WEEKS) %>"><spring:message code="common.tp.week"/></sst:option></c:if>
+        <c:if test="${mon}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MONTHS) %>"><spring:message code="common.tp.month"/></sst:option></c:if>
+        <c:if test="${y}"><sst:option value="<%= Integer.toString(Common.TimePeriods.YEARS) %>"><spring:message code="common.tp.year"/></sst:option></c:if>
       </c:when>
       <c:otherwise>
-        <c:if test="${ms}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MILLISECONDS) %>"><fmt:message key="common.tp.milliseconds"/></sst:option></c:if>
-        <c:if test="${s}"><sst:option value="<%= Integer.toString(Common.TimePeriods.SECONDS) %>"><fmt:message key="common.tp.seconds"/></sst:option></c:if>
-        <c:if test="${min}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MINUTES) %>"><fmt:message key="common.tp.minutes"/></sst:option></c:if>
-        <c:if test="${h}"><sst:option value="<%= Integer.toString(Common.TimePeriods.HOURS) %>"><fmt:message key="common.tp.hours"/></sst:option></c:if>
-        <c:if test="${d}"><sst:option value="<%= Integer.toString(Common.TimePeriods.DAYS) %>"><fmt:message key="common.tp.days"/></sst:option></c:if>
-        <c:if test="${w}"><sst:option value="<%= Integer.toString(Common.TimePeriods.WEEKS) %>"><fmt:message key="common.tp.weeks"/></sst:option></c:if>
-        <c:if test="${mon}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MONTHS) %>"><fmt:message key="common.tp.months"/></sst:option></c:if>
-        <c:if test="${y}"><sst:option value="<%= Integer.toString(Common.TimePeriods.YEARS) %>"><fmt:message key="common.tp.years"/></sst:option></c:if>
+        <c:if test="${ms}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MILLISECONDS) %>"><spring:message code="common.tp.milliseconds"/></sst:option></c:if>
+        <c:if test="${s}"><sst:option value="<%= Integer.toString(Common.TimePeriods.SECONDS) %>"><spring:message code="common.tp.seconds"/></sst:option></c:if>
+        <c:if test="${min}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MINUTES) %>"><spring:message code="common.tp.minutes"/></sst:option></c:if>
+        <c:if test="${h}"><sst:option value="<%= Integer.toString(Common.TimePeriods.HOURS) %>"><spring:message code="common.tp.hours"/></sst:option></c:if>
+        <c:if test="${d}"><sst:option value="<%= Integer.toString(Common.TimePeriods.DAYS) %>"><spring:message code="common.tp.days"/></sst:option></c:if>
+        <c:if test="${w}"><sst:option value="<%= Integer.toString(Common.TimePeriods.WEEKS) %>"><spring:message code="common.tp.weeks"/></sst:option></c:if>
+        <c:if test="${mon}"><sst:option value="<%= Integer.toString(Common.TimePeriods.MONTHS) %>"><spring:message code="common.tp.months"/></sst:option></c:if>
+        <c:if test="${y}"><sst:option value="<%= Integer.toString(Common.TimePeriods.YEARS) %>"><spring:message code="common.tp.years"/></sst:option></c:if>
       </c:otherwise>
     </c:choose>  
   </c:when>
   <c:otherwise>
     <c:choose>
       <c:when test="${singular}">
-        <c:if test="${ms}"><option value="<%= Common.TimePeriods.MILLISECONDS %>"><fmt:message key="common.tp.millisecond"/></option></c:if>
-        <c:if test="${s}"><option value="<%= Common.TimePeriods.SECONDS %>"><fmt:message key="common.tp.second"/></option></c:if>
-        <c:if test="${min}"><option value="<%= Common.TimePeriods.MINUTES %>"><fmt:message key="common.tp.minute"/></option></c:if>
-        <c:if test="${h}"><option value="<%= Common.TimePeriods.HOURS %>"><fmt:message key="common.tp.hour"/></option></c:if>
-        <c:if test="${d}"><option value="<%= Common.TimePeriods.DAYS %>"><fmt:message key="common.tp.day"/></option></c:if>
-        <c:if test="${w}"><option value="<%= Common.TimePeriods.WEEKS %>"><fmt:message key="common.tp.week"/></option></c:if>
-        <c:if test="${mon}"><option value="<%= Common.TimePeriods.MONTHS %>"><fmt:message key="common.tp.month"/></option></c:if>
-        <c:if test="${y}"><option value="<%= Common.TimePeriods.YEARS %>"><fmt:message key="common.tp.year"/></option></c:if>
+        <c:if test="${ms}"><option value="<%= Common.TimePeriods.MILLISECONDS %>"><spring:message code="common.tp.millisecond"/></option></c:if>
+        <c:if test="${s}"><option value="<%= Common.TimePeriods.SECONDS %>"><spring:message code="common.tp.second"/></option></c:if>
+        <c:if test="${min}"><option value="<%= Common.TimePeriods.MINUTES %>"><spring:message code="common.tp.minute"/></option></c:if>
+        <c:if test="${h}"><option value="<%= Common.TimePeriods.HOURS %>"><spring:message code="common.tp.hour"/></option></c:if>
+        <c:if test="${d}"><option value="<%= Common.TimePeriods.DAYS %>"><spring:message code="common.tp.day"/></option></c:if>
+        <c:if test="${w}"><option value="<%= Common.TimePeriods.WEEKS %>"><spring:message code="common.tp.week"/></option></c:if>
+        <c:if test="${mon}"><option value="<%= Common.TimePeriods.MONTHS %>"><spring:message code="common.tp.month"/></option></c:if>
+        <c:if test="${y}"><option value="<%= Common.TimePeriods.YEARS %>"><spring:message code="common.tp.year"/></option></c:if>
       </c:when>
       <c:otherwise>
-        <c:if test="${ms}"><option value="<%= Common.TimePeriods.MILLISECONDS %>"><fmt:message key="common.tp.milliseconds"/></option></c:if>
-        <c:if test="${s}"><option value="<%= Common.TimePeriods.SECONDS %>"><fmt:message key="common.tp.seconds"/></option></c:if>
-        <c:if test="${min}"><option value="<%= Common.TimePeriods.MINUTES %>"><fmt:message key="common.tp.minutes"/></option></c:if>
-        <c:if test="${h}"><option value="<%= Common.TimePeriods.HOURS %>"><fmt:message key="common.tp.hours"/></option></c:if>
-        <c:if test="${d}"><option value="<%= Common.TimePeriods.DAYS %>"><fmt:message key="common.tp.days"/></option></c:if>
-        <c:if test="${w}"><option value="<%= Common.TimePeriods.WEEKS %>"><fmt:message key="common.tp.weeks"/></option></c:if>
-        <c:if test="${mon}"><option value="<%= Common.TimePeriods.MONTHS %>"><fmt:message key="common.tp.months"/></option></c:if>
-        <c:if test="${y}"><option value="<%= Common.TimePeriods.YEARS %>"><fmt:message key="common.tp.years"/></option></c:if>
+        <c:if test="${ms}"><option value="<%= Common.TimePeriods.MILLISECONDS %>"><spring:message code="common.tp.milliseconds"/></option></c:if>
+        <c:if test="${s}"><option value="<%= Common.TimePeriods.SECONDS %>"><spring:message code="common.tp.seconds"/></option></c:if>
+        <c:if test="${min}"><option value="<%= Common.TimePeriods.MINUTES %>"><spring:message code="common.tp.minutes"/></option></c:if>
+        <c:if test="${h}"><option value="<%= Common.TimePeriods.HOURS %>"><spring:message code="common.tp.hours"/></option></c:if>
+        <c:if test="${d}"><option value="<%= Common.TimePeriods.DAYS %>"><spring:message code="common.tp.days"/></option></c:if>
+        <c:if test="${w}"><option value="<%= Common.TimePeriods.WEEKS %>"><spring:message code="common.tp.weeks"/></option></c:if>
+        <c:if test="${mon}"><option value="<%= Common.TimePeriods.MONTHS %>"><spring:message code="common.tp.months"/></option></c:if>
+        <c:if test="${y}"><option value="<%= Common.TimePeriods.YEARS %>"><spring:message code="common.tp.years"/></option></c:if>
       </c:otherwise>
     </c:choose>
   </c:otherwise>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 9080f8330a..9c36167338 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -44,6 +44,10 @@
     <param-name>com.serotonin.web.taglib.ListSortTag.downImage.altKey</param-name>
     <param-value>pagination.descending</param-value>
   </context-param>
+  <context-param>
+    <param-name>defaultHtmlEscape</param-name>
+    <param-value>true</param-value>
+  </context-param>
 
   <!-- Log4j2 -->
   <context-param>
diff --git a/WebContent/assets/layout.css b/WebContent/assets/layout.css
index 986caa7a2c..905f93ca2c 100644
--- a/WebContent/assets/layout.css
+++ b/WebContent/assets/layout.css
@@ -142,6 +142,11 @@ a.rowHeaderLink, a.rowHeaderLink:visited, a.rowHeaderLink:link, a.rowHeaderLink:
 .formLong {
 	width: 250px;
 }
+.formLongFieldSizing {
+	min-width: 250px;
+	max-width: 650px;
+    field-sizing: content;
+}
 input[type="submit"], input[type="button"] {
 	overflow: visible;
 }
diff --git a/WebContent/assets/user_styles.css b/WebContent/assets/user_styles.css
index eafa3b1363..1aa62c78c6 100644
--- a/WebContent/assets/user_styles.css
+++ b/WebContent/assets/user_styles.css
@@ -13,4 +13,29 @@
  * #viewContainer > #viewContent .slts-btn {
  *  font-size: 1.5em;
  * }
- */
\ No newline at end of file
+ */
+
+/* ----- Custom information stylesheet ----- */
+#top-description-container {
+    display: flex;
+    align-items: flex-end;
+    justify-content: center;
+}
+
+#top-description-prefix {
+    color: black !important;
+    font-size: 2em !important;
+    margin-left: 0.5em !important;
+    margin-right: 0.5em !important;
+    display: inline-block !important;
+    vertical-align: bottom !important;
+    line-height: 1 !important;
+}
+
+#top-description {
+    color: #39B54A !important;
+    font-size: 2em !important;
+    display: inline-block !important;
+    vertical-align: bottom !important;
+    line-height: 1 !important;
+}
\ No newline at end of file
diff --git a/WebContent/resources/common.js b/WebContent/resources/common.js
index fc081d2df5..dcad2dbded 100644
--- a/WebContent/resources/common.js
+++ b/WebContent/resources/common.js
@@ -1215,8 +1215,11 @@ function disconnectWebsocket() {
 }
 
 function onloadHandlerWebsocket() {
-    let endpoint = scadalts.websocket.endpoints.main;
-    scadalts.websocket.client = connectWebsocket(getAppLocation() + endpoint, {}, errorCallbackWebsocket, connectCallbackWebsocket);
+    let location = window.location.href;
+    if(!location.includes('app.shtm')) {
+        let endpoint = scadalts.websocket.endpoints.main;
+        scadalts.websocket.client = connectWebsocket(getAppLocation() + endpoint, {}, errorCallbackWebsocket, connectCallbackWebsocket);
+    }
 }
 
 function getAppLocation() {
@@ -1260,3 +1263,412 @@ function OnListWebsocketStats() {
 		console.log("message[/app/websocketStats]:\n" + message.body);
 	} );
 }
+
+function assignEvent(eventId) {
+    MiscDwr.assignEvent(eventId, function(response) {
+        if(response) {
+            hide("assigneeImg"+ eventId);
+            var imgNode = $("assigneeImg"+ eventId);
+            updateImg(imgNode, "images/user_delete.png", mango.i18n["events.unassign"], true, "inline");
+            imgNode.onclick = function() {};
+        }
+    });
+}
+
+function unassignEvent(eventId) {
+    MiscDwr.unassignEvent(eventId, function(response) {
+        if(response) {
+            hide("unassigneeImg"+ eventId);
+            var imgNode = $("unassigneeImg"+ eventId);
+            updateImg(imgNode, "images/user_add.png", mango.i18n["events.assign"], true, "inline");
+            imgNode.onclick = function() {};
+        }
+    });
+}
+
+function isEmpty(value) {
+    return !value || (typeof value === "string" && value.trim() === "");
+}
+
+function unescapeHtml(value) {
+   let div = document.createElement("div");
+   div.innerHTML = value;
+   return div.textContent || div.innerText;
+}
+
+function escapeHtml(value) {
+   let div = document.createElement("div");
+   div.textContent = value;
+   div.innerText = value;
+   return div.innerHTML;
+}
+
+function setValueInNode(id, text) {
+   let node = document.getElementById(id);
+   if(node) {
+       node.value = text;
+   }
+}
+
+function ScriptPointsContext(startContext, points) {
+
+    this.contextArray = new Array();
+    this.pointsArray = new Array();
+    this.contextTableId = "contextTable";
+    this.contextTableEmptyId = "contextTableEmpty";
+    this.contextTableHeadersId = "contextTableHeaders";
+    this.allPointsListId = "allPointsList";
+
+    this.initContextArray = function (context, points) {
+       console.log('initContextArray context: ', context);
+       console.log('initContextArray points: ', points);
+       this.pointsArray = points;
+       dwr.util.removeAllRows(this.contextTableId);
+       for (let i = 0; i < context.length; i++) {
+            let row = this.addToContextArray(context[i].key, context[i].value);
+            this.writeContextArray(row);
+       }
+       this.updatePointsList();
+    }
+
+    this.convertToSave = function () {
+       let context = new Array();
+       for (let i = 0; i < this.contextArray.length; i++) {
+          context[context.length] = {
+              key : this.contextArray[i].pointId,
+              value : this.contextArray[i].scriptVarName
+          };
+       }
+       return context;
+    }
+
+    this.addPointToContext = function () {
+        let pointId = $get(this.allPointsListId);
+        let row = this.addToContextArray(pointId, "p"+ pointId);
+        this.writeContextArray(row);
+    }
+
+    this.addToContextArray = function (pointId, scriptVarName) {
+       let data = getElement(this.pointsArray, pointId);
+       if (data) {
+          this.contextArray[this.contextArray.length] = {
+              pointId : pointId,
+              pointName : data.name,
+              xid : data.xid,
+              pointType : data.type,
+              scriptVarName : scriptVarName
+          };
+          return this.contextArray[this.contextArray.length - 1];
+       }
+       return null;
+    }
+
+    this.removeFromContextArray = function (pointId) {
+       for (let i = 0; i < this.contextArray.length; i++) {
+          let context = this.contextArray[i];
+          if (context.pointId == pointId) {
+              this.removeContextArray(context);
+              this.contextArray.splice(i, 1);
+              this.updatePointsList();
+          }
+       }
+    }
+
+    this.writeContextArray = function (row) {
+       if (this.contextArray.length == 0) {
+          show($(this.contextTableEmptyId));
+          hide($(this.contextTableHeadersId));
+       } else {
+          hide($(this.contextTableEmptyId));
+          show($(this.contextTableHeadersId));
+          dwr.util.addRows(this.contextTableId, [row],
+              [
+                  function(data) { return "<span>" + data.pointName + "</span>" },
+                  function(data) { return "<span>" + data.xid + "</span>"; },
+                  function(data) { return data.pointType; },
+                  function(data) {
+                          return "<input type='text' value='"+ data.scriptVarName +"' class='formShort' "+
+                                  "onblur='scriptPointsContext.updatePoint("+ data.pointId +",\'scriptVarName\', this.value)'/>";
+                  },
+                  function(data) {
+                          return "<img src='images/bullet_delete.png' class='ptr' "+
+                                  "onclick='scriptPointsContext.removeFromContextArray("+ data.pointId +")'/>";
+                  }
+              ],
+              {
+                  rowCreator:function(options) {
+                      var tr = document.createElement("tr");
+                      tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
+                      return tr;
+                  }
+              });
+      }
+      this.updatePointsList();
+    }
+
+    this.removeContextArray = function (row) {
+       if (this.contextArray.length == 0) {
+          show($(this.contextTableEmptyId));
+          hide($(this.contextTableHeadersId));
+       } else {
+          hide($(this.contextTableEmptyId));
+          show($(this.contextTableHeadersId));
+          this.removeRow(this.contextTableId, row, [1], ["xid"]);
+       }
+    }
+
+    this.updatePointsList = function () {
+       let availPoints = new Array();
+       for (let i = 0; i < this.pointsArray.length; i++) {
+          let found = false;
+          for (let j = 0; j < this.contextArray.length; j++) {
+              if (this.contextArray[j].pointId == this.pointsArray[i].id) {
+                  found = true;
+                  break;
+              }
+          }
+          if (!found) {
+              availPoints[availPoints.length] = this.pointsArray[i];
+          }
+       }
+       this.addOptions(this.allPointsListId, availPoints, "id", "name");
+       jQuery("#" + this.allPointsListId).trigger('chosen:updated');
+    }
+
+    this.addOptions = function (id, availPoints, key, value) {
+      document.getElementById(id).options.length = 0;
+      let select = document.getElementById(id);
+      for (let i = 0; i < availPoints.length; i++) {
+          let opt = document.createElement('option');
+          opt.value = availPoints[i][key];
+          opt.innerHTML = availPoints[i][value];
+          select.appendChild(opt);
+      }
+    }
+
+    this.removeRow = function (tableId, criteriaToDelete, rowOptions, criteriaToDeleteOptions) {
+      let table = document.getElementById(tableId);
+      let rows = table.rows;
+      let toDeleteIndexes = new Array();
+      for (let i = 0; i < rows.length; i++) {
+          let row = rows[i];
+          if(this.equalsByOptions(row, criteriaToDelete, rowOptions, criteriaToDeleteOptions)) {
+              toDeleteIndexes[toDeleteIndexes.length] = i;
+          }
+      }
+
+      for(let i = 0; i < toDeleteIndexes.length; i++) {
+          table.deleteRow(toDeleteIndexes[i]);
+      }
+    }
+
+    this.equalsByOptions = function (row, obj, rowOptions, objOptions) {
+      for (let i = 0; i < objOptions.length; i++) {
+          let cellValue = row.cells[rowOptions[i]].textContent;
+          let objectValue = obj[objOptions[i]];
+          if (!cellValue || !objectValue) {
+              return false;
+          }
+          if (cellValue != objectValue) {
+              return false;
+          }
+      }
+      return true;
+    }
+
+    this.updatePoint = function (pointId, key, value) {
+        var item = getElement(this.contextArray, pointId, "pointId");
+        if (item)
+            item[key] = value;
+    }
+
+    this.initContextArray(startContext, points);
+}
+
+function ReportPointsContext(startContext, points) {
+
+    this.contextArray = new Array();
+    this.pointsArray = new Array();
+    this.contextTableId = "contextTable";
+    this.contextTableEmptyId = "contextTableEmpty";
+    this.contextTableHeadersId = "contextTableHeaders";
+    this.allPointsListId = "allPointsList";
+
+    this.initContextArray = function (context, points) {
+       console.log('initContextArray context: ', context);
+       console.log('initContextArray points: ', points);
+       this.pointsArray = points;
+       dwr.util.removeAllRows(this.contextTableId);
+       for (let i = 0; i < context.length; i++) {
+            let row = this.addToContextArray(context[i].pointId, context[i].colour, context[i].consolidatedChart);
+            this.writeContextArray(row);
+       }
+       this.updatePointsList();
+    }
+
+    this.convertToSave = function () {
+       let context = new Array();
+       for (let i = 0; i < this.contextArray.length; i++) {
+          context[context.length] = {
+                pointId: this.contextArray[i].pointId,
+                pointXid: this.contextArray[i].xid,
+                colour: this.contextArray[i].colour,
+                consolidatedChart: this.contextArray[i].consolidatedChart
+          };
+       }
+       return context;
+    }
+
+    this.addPointToContext = function () {
+        let pointId = $get(this.allPointsListId);
+        let reportRow = this.addToContextArray(pointId, "", true);
+        this.writeContextArray(reportRow);
+    }
+
+    this.addToContextArray = function (pointId, colour, consolidatedChart) {
+       let data = getElement(this.pointsArray, pointId);
+       if (data) {
+          this.contextArray[this.contextArray.length] = {
+                pointId: pointId,
+                pointXid: data.xid,
+                pointName : data.name,
+                pointType : data.dataTypeMessage,
+                colour : !colour ? (!data.chartColour ? "" : data.chartColour) : colour,
+                consolidatedChart : consolidatedChart
+          };
+          return this.contextArray[this.contextArray.length - 1];
+       }
+       return null;
+    }
+
+    this.writeContextArray = function (row) {
+        if (this.contextArray.length == 0) {
+            show($(this.contextTableEmptyId));
+            hide($(this.contextTableHeadersId));
+        } else {
+            hide($(this.contextTableEmptyId));
+            show($(this.contextTableHeadersId));
+            dwr.util.addRows(this.contextTableId, [row],
+                [
+                    function(data) { return data.pointName; },
+                    function(data) { return data.pointXid; },
+                    function(data) { return data.pointType; },
+                    function(data) {
+                            return "<input type='text' value='"+ data.colour +"' "+
+                                    "onblur='reportPointsContext.updatePoint("+ data.pointId +", \"colour\", this.value)'/>";
+                    },
+                    function(data) {
+                        return "<input type='checkbox'"+ (data.consolidatedChart ? " checked='checked'" : "") +
+                                " onclick='reportPointsContext.updatePoint("+ data.pointId +", \"consolidatedChart\", this.checked)'/>";
+                    },
+                    function(data) {
+                            return "<img src='images/bullet_delete.png' class='ptr' "+
+                                    "onclick='reportPointsContext.removeFromContextArray("+ data.pointId +")'/>";
+                    }
+                ],
+                {
+                    rowCreator:function(options) {
+                        var tr = document.createElement("tr");
+                        tr.className = "smRow"+ (options.rowIndex % 2 == 0 ? "" : "Alt");
+                        return tr;
+                    },
+                    cellCreator:function(options) {
+                        var td = document.createElement("td");
+                        if (options.cellNum == 4)
+                            td.align = "center";
+                        return td;
+                    }
+                });
+        }
+        this.updatePointsList();
+    }
+
+    this.removeFromContextArray = function (pointId) {
+       for (let i = 0; i < this.contextArray.length; i++) {
+          let context = this.contextArray[i];
+          if (context.pointId == pointId) {
+              this.removeContextArray(context);
+              this.contextArray.splice(i, 1);
+              this.updatePointsList();
+          }
+       }
+    }
+
+    this.removeContextArray = function (row) {
+       if (this.contextArray.length == 0) {
+          show($(this.contextTableEmptyId));
+          hide($(this.contextTableHeadersId));
+       } else {
+          hide($(this.contextTableEmptyId));
+          show($(this.contextTableHeadersId));
+          this.removeRow(this.contextTableId, row, [1], ["pointXid"]);
+       }
+    }
+
+    this.updatePointsList = function () {
+       let availPoints = new Array();
+       for (let i = 0; i < this.pointsArray.length; i++) {
+          let found = false;
+          for (let j = 0; j < this.contextArray.length; j++) {
+              if (this.contextArray[j].pointId == this.pointsArray[i].id) {
+                  found = true;
+                  break;
+              }
+          }
+          if (!found) {
+              availPoints[availPoints.length] = this.pointsArray[i];
+          }
+       }
+       this.addOptions(this.allPointsListId, availPoints, "id", "name");
+       jQuery("#" + this.allPointsListId).trigger('chosen:updated');
+    }
+
+    this.addOptions = function (id, availPoints, key, value) {
+      document.getElementById(id).options.length = 0;
+      let select = document.getElementById(id);
+      for (let i = 0; i < availPoints.length; i++) {
+          let opt = document.createElement('option');
+          opt.value = availPoints[i][key];
+          opt.innerHTML = availPoints[i][value];
+          select.appendChild(opt);
+      }
+    }
+
+    this.removeRow = function (tableId, criteriaToDelete, rowOptions, criteriaToDeleteOptions) {
+      let table = document.getElementById(tableId);
+      let rows = table.rows;
+      let toDeleteIndexes = new Array();
+      for (let i = 0; i < rows.length; i++) {
+          let row = rows[i];
+          if(this.equalsByOptions(row, criteriaToDelete, rowOptions, criteriaToDeleteOptions)) {
+              toDeleteIndexes[toDeleteIndexes.length] = i;
+          }
+      }
+
+      for(let i = 0; i < toDeleteIndexes.length; i++) {
+          table.deleteRow(toDeleteIndexes[i]);
+      }
+    }
+
+    this.equalsByOptions = function (row, obj, rowOptions, objOptions) {
+      for (let i = 0; i < objOptions.length; i++) {
+          let cellValue = row.cells[rowOptions[i]].textContent;
+          let objectValue = obj[objOptions[i]];
+          if (!cellValue || !objectValue) {
+              return false;
+          }
+          if (cellValue != objectValue) {
+              return false;
+          }
+      }
+      return true;
+    }
+
+    this.updatePoint = function (pointId, key, value) {
+        var item = getElement(this.contextArray, pointId, "pointId");
+        if (item)
+            item[key] = value;
+    }
+
+    this.initContextArray(startContext, points);
+}
\ No newline at end of file
diff --git a/WebContent/resources/package-lock.json b/WebContent/resources/package-lock.json
index 193b986156..6a16dc41e0 100644
--- a/WebContent/resources/package-lock.json
+++ b/WebContent/resources/package-lock.json
@@ -1,237 +1,404 @@
 {
   "name": "scada-lts-webapp",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@babel/parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz",
-      "integrity": "sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA=="
+  "packages": {
+    "": {
+      "name": "scada-lts-webapp",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "axios": "0.21.4",
+        "bootstrap": "3.4.1",
+        "bootstrap3-dialog": "1.35.4",
+        "jquery": "3.6.1",
+        "jquery-ui-dist": "1.12.1",
+        "jquery.fancytree": "2.18.0",
+        "json-lint": "0.1.0",
+        "sockjs-client": "1.6.0",
+        "stompjs": "2.3.3",
+        "sweetalert2": "7.33.1",
+        "vue": "2.7.10",
+        "vue-axios": "2.1.5",
+        "vue-jsoneditor": "1.0.13"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.25.6"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "@sphinxxxx/color-conversion": {
+    "node_modules/@sphinxxxx/color-conversion": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz",
-      "integrity": "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw=="
+      "integrity": "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw==",
+      "license": "ISC"
     },
-    "@vue/compiler-sfc": {
+    "node_modules/@vue/compiler-sfc": {
       "version": "2.7.10",
       "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz",
       "integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==",
-      "requires": {
+      "dependencies": {
         "@babel/parser": "^7.18.4",
         "postcss": "^8.4.14",
         "source-map": "^0.6.1"
       }
     },
-    "ajv": {
+    "node_modules/ajv": {
       "version": "5.5.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
       "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
-      "requires": {
+      "license": "MIT",
+      "dependencies": {
         "co": "^4.6.0",
         "fast-deep-equal": "^1.0.0",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.3.0"
       }
     },
-    "axios": {
+    "node_modules/axios": {
       "version": "0.21.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
       "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-      "requires": {
+      "license": "MIT",
+      "dependencies": {
         "follow-redirects": "^1.14.0"
       }
     },
-    "bootstrap": {
+    "node_modules/bootstrap": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
+      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "bootstrap3-dialog": {
+    "node_modules/bootstrap3-dialog": {
       "version": "1.35.4",
       "resolved": "https://registry.npmjs.org/bootstrap3-dialog/-/bootstrap3-dialog-1.35.4.tgz",
-      "integrity": "sha512-wHrJmqASIEsZWhHhfq9q0QhhGI8AnSh4tAAjUGK0MfMZjZ6vFl0niDZs5IwFDChCKKjcgFiFnXxLLoJ6nvyI2A=="
+      "integrity": "sha512-wHrJmqASIEsZWhHhfq9q0QhhGI8AnSh4tAAjUGK0MfMZjZ6vFl0niDZs5IwFDChCKKjcgFiFnXxLLoJ6nvyI2A==",
+      "license": "MIT"
     },
-    "brace": {
+    "node_modules/brace": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
-      "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q=="
-    },
-    "bufferutil": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.6.tgz",
-      "integrity": "sha512-jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw==",
+      "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==",
+      "license": "MIT"
+    },
+    "node_modules/bufferutil": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz",
+      "integrity": "sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==",
+      "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
-      "requires": {
+      "dependencies": {
         "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=6.14.2"
       }
     },
-    "co": {
+    "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "license": "MIT",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
     },
-    "csstype": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-      "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "license": "MIT"
     },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
+    "node_modules/d": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
+      "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "es5-ext": "^0.10.64",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.12"
       }
     },
-    "debug": {
+    "node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "requires": {
+      "license": "MIT",
+      "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "drag-tracker": {
+    "node_modules/drag-tracker": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/drag-tracker/-/drag-tracker-1.0.0.tgz",
-      "integrity": "sha512-BSGDl37YXpW49dLMRfiDExxzD3yPOpLEBGx05Wed3z2sk2+Qd5dFvHCSVFTPsGTeltGBtkRB4qhLhSKv6tvBKw=="
-    },
-    "es5-ext": {
-      "version": "0.10.62",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
-      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
-      "requires": {
+      "integrity": "sha512-BSGDl37YXpW49dLMRfiDExxzD3yPOpLEBGx05Wed3z2sk2+Qd5dFvHCSVFTPsGTeltGBtkRB4qhLhSKv6tvBKw==",
+      "license": "MIT"
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.64",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
+      "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
+      "hasInstallScript": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
         "es6-iterator": "^2.0.3",
         "es6-symbol": "^3.1.3",
+        "esniff": "^2.0.1",
         "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "es6-iterator": {
+    "node_modules/es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
-      "requires": {
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
         "d": "1",
         "es5-ext": "^0.10.35",
         "es6-symbol": "^3.1.1"
       }
     },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "requires": {
+    "node_modules/es6-symbol": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
+      "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "d": "^1.0.2",
+        "ext": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/esniff": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
         "d": "^1.0.1",
-        "ext": "^1.1.2"
+        "es5-ext": "^0.10.62",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "eventsource": {
+    "node_modules/event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "node_modules/eventsource": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz",
-      "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA=="
+      "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
     },
-    "ext": {
+    "node_modules/ext": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
       "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
-      "requires": {
-        "type": "^2.7.2"
-      },
+      "license": "ISC",
+      "optional": true,
       "dependencies": {
-        "type": {
-          "version": "2.7.2",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
-        }
+        "type": "^2.7.2"
       }
     },
-    "fast-deep-equal": {
+    "node_modules/fast-deep-equal": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw=="
+      "integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
+      "license": "MIT"
     },
-    "fast-json-stable-stringify": {
+    "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "license": "MIT"
     },
-    "faye-websocket": {
+    "node_modules/faye-websocket": {
       "version": "0.11.4",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "requires": {
+      "license": "Apache-2.0",
+      "dependencies": {
         "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
     },
-    "http-parser-js": {
+    "node_modules/http-parser-js": {
       "version": "0.5.8",
       "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "license": "MIT"
     },
-    "inherits": {
+    "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
     },
-    "is-typedarray": {
+    "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "license": "MIT",
       "optional": true
     },
-    "javascript-natural-sort": {
+    "node_modules/javascript-natural-sort": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
+      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
+      "license": "MIT"
     },
-    "jmespath": {
+    "node_modules/jmespath": {
       "version": "0.15.0",
       "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-      "integrity": "sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w=="
+      "integrity": "sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
     },
-    "jquery": {
+    "node_modules/jquery": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
-      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
+      "license": "MIT"
     },
-    "jquery-ui-dist": {
+    "node_modules/jquery-ui-dist": {
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz",
-      "integrity": "sha512-UnQQWIvxaP7s13FLx37WufEwDYLSXKpp9JHrqEYTP6GqQNM+RMVEwsJMoc163QlzEaAV5YVfWlgQU5FPjKBtSw=="
+      "integrity": "sha512-UnQQWIvxaP7s13FLx37WufEwDYLSXKpp9JHrqEYTP6GqQNM+RMVEwsJMoc163QlzEaAV5YVfWlgQU5FPjKBtSw==",
+      "license": "MIT"
     },
-    "jquery.fancytree": {
+    "node_modules/jquery.fancytree": {
       "version": "2.18.0",
       "resolved": "https://registry.npmjs.org/jquery.fancytree/-/jquery.fancytree-2.18.0.tgz",
-      "integrity": "sha512-thZThwhAintFCB7wOBDh+Ibq9H+0hi6bnqsDDZfGW63tyXFijy7LZKNxZAuIoPXJyUfmfHHBpuZEYzyg6LjmkA=="
+      "integrity": "sha512-thZThwhAintFCB7wOBDh+Ibq9H+0hi6bnqsDDZfGW63tyXFijy7LZKNxZAuIoPXJyUfmfHHBpuZEYzyg6LjmkA==",
+      "license": "MIT"
     },
-    "json-lint": {
+    "node_modules/json-lint": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/json-lint/-/json-lint-0.1.0.tgz",
-      "integrity": "sha512-QoBMCAo3sFnAl2nvCcrt5NmjqMRejlghhMvZ0ykhgfNpp7ukp1te7dP6q2o4fkvl03t08t75njni+y6S7jiHLg=="
+      "integrity": "sha512-QoBMCAo3sFnAl2nvCcrt5NmjqMRejlghhMvZ0ykhgfNpp7ukp1te7dP6q2o4fkvl03t08t75njni+y6S7jiHLg==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "engines": {
+        "node": ">=0.5"
+      }
     },
-    "json-schema-traverse": {
+    "node_modules/json-schema-traverse": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA=="
+      "integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
+      "license": "MIT"
     },
-    "json-source-map": {
+    "node_modules/json-source-map": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-source-map/-/json-source-map-0.4.0.tgz",
-      "integrity": "sha512-fVJ2mGl6pmYNmgseQch8X1ghdDntxeYgQQueypu9ZvttZwlSQuW4QztPBxgomRiRBidj5g7PtTW+7EqsTnEDNw=="
+      "integrity": "sha512-fVJ2mGl6pmYNmgseQch8X1ghdDntxeYgQQueypu9ZvttZwlSQuW4QztPBxgomRiRBidj5g7PtTW+7EqsTnEDNw==",
+      "license": "MIT"
     },
-    "jsoneditor": {
+    "node_modules/jsoneditor": {
       "version": "5.34.0",
       "resolved": "https://registry.npmjs.org/jsoneditor/-/jsoneditor-5.34.0.tgz",
       "integrity": "sha512-/F7L6oXuRkv2/FKFIL4NMWF0P+oVvSWLJPVEVP/7KGehBj6dtOp5FKdfLcNkIgbqzklXx/NDzHSXYlf64wqmuQ==",
-      "requires": {
+      "license": "Apache-2.0",
+      "dependencies": {
         "ajv": "5.5.2",
         "brace": "0.11.1",
         "javascript-natural-sort": "0.7.1",
@@ -242,217 +409,342 @@
         "vanilla-picker": "2.8.0"
       }
     },
-    "mobius1-selectr": {
+    "node_modules/mobius1-selectr": {
       "version": "2.4.10",
       "resolved": "https://registry.npmjs.org/mobius1-selectr/-/mobius1-selectr-2.4.10.tgz",
-      "integrity": "sha512-U/pQ8jZwO7z3Mf9OYzJR6AKfleF5jSBIueKKxGMr/tgyLuTWgchgFyeaXpAIz3Cbp+7eIN1hw5D2gxc4cNnOkQ=="
+      "integrity": "sha512-U/pQ8jZwO7z3Mf9OYzJR6AKfleF5jSBIueKKxGMr/tgyLuTWgchgFyeaXpAIz3Cbp+7eIN1hw5D2gxc4cNnOkQ==",
+      "license": "MIT"
     },
-    "ms": {
+    "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
     },
-    "next-tick": {
+    "node_modules/next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
-    },
-    "node-gyp-build": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
-      "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "license": "ISC",
       "optional": true
     },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    "node_modules/node-gyp-build": {
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
+      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "license": "ISC"
     },
-    "picomodal": {
+    "node_modules/picomodal": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/picomodal/-/picomodal-3.0.0.tgz",
-      "integrity": "sha512-FoR3TDfuLlqUvcEeK5ifpKSVVns6B4BQvc8SDF6THVMuadya6LLtji0QgUDSStw0ZR2J7I6UGi5V2V23rnPWTw=="
-    },
-    "postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
-      "requires": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+      "integrity": "sha512-FoR3TDfuLlqUvcEeK5ifpKSVVns6B4BQvc8SDF6THVMuadya6LLtji0QgUDSStw0ZR2J7I6UGi5V2V23rnPWTw==",
+      "license": "MIT"
+    },
+    "node_modules/postcss": {
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
       }
     },
-    "querystringify": {
+    "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "license": "MIT"
     },
-    "requires-port": {
+    "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "license": "MIT"
     },
-    "safe-buffer": {
+    "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
     },
-    "sockjs-client": {
+    "node_modules/sockjs-client": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz",
       "integrity": "sha512-qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ==",
-      "requires": {
+      "license": "MIT",
+      "dependencies": {
         "debug": "^3.2.7",
         "eventsource": "^1.1.0",
         "faye-websocket": "^0.11.4",
         "inherits": "^2.0.4",
         "url-parse": "^1.5.10"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://tidelift.com/funding/github/npm/sockjs-client"
       }
     },
-    "source-map": {
+    "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "stompjs": {
+    "node_modules/stompjs": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/stompjs/-/stompjs-2.3.3.tgz",
       "integrity": "sha512-5l/Ogz0DTFW7TrpHF0LAETGqM/so8UxNJvYZjJKqcX31EVprSQgnGkO80tZctPC/lFBDUrSFiTG3xd0R27XAIA==",
-      "requires": {
-        "websocket": "^1.0.34"
+      "license": "Apache-2.0",
+      "optionalDependencies": {
+        "websocket": "latest"
       }
     },
-    "sweetalert2": {
+    "node_modules/sweetalert2": {
       "version": "7.33.1",
       "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-7.33.1.tgz",
-      "integrity": "sha512-69KYtyhtxejFG0HDb8aVhAwbpAWPSTZwaL5vxDHgojErD2KeFxTmRgmkbiLtMC8UdTFXRmvTPtZTF4459MUb7w=="
+      "integrity": "sha512-69KYtyhtxejFG0HDb8aVhAwbpAWPSTZwaL5vxDHgojErD2KeFxTmRgmkbiLtMC8UdTFXRmvTPtZTF4459MUb7w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+    "node_modules/type": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
+      "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
+      "license": "ISC",
+      "optional": true
     },
-    "typedarray-to-buffer": {
+    "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "license": "MIT",
       "optional": true,
-      "requires": {
+      "dependencies": {
         "is-typedarray": "^1.0.0"
       }
     },
-    "url-parse": {
+    "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
       "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "requires": {
+      "license": "MIT",
+      "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
       }
     },
-    "utf-8-validate": {
-      "version": "5.0.9",
-      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz",
-      "integrity": "sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q==",
+    "node_modules/utf-8-validate": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
+      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
-      "requires": {
+      "dependencies": {
         "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=6.14.2"
       }
     },
-    "vanilla-picker": {
+    "node_modules/vanilla-picker": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.8.0.tgz",
       "integrity": "sha512-NPBxrtLi2LA2mEyRLW+Lyt7Eqtm0t0SmKqscE5RaugXLtJXXjPzy6r65fqLiQkhRc2WoLnmj2m/EnTWKN4hL+g==",
-      "requires": {
+      "license": "ISC",
+      "dependencies": {
         "@sphinxxxx/color-conversion": "^2.2.1",
         "drag-tracker": "^1.0.0"
       }
     },
-    "vue": {
+    "node_modules/vue": {
       "version": "2.7.10",
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz",
       "integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==",
-      "requires": {
+      "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+      "license": "MIT",
+      "dependencies": {
         "@vue/compiler-sfc": "2.7.10",
         "csstype": "^3.1.0"
       }
     },
-    "vue-axios": {
+    "node_modules/vue-axios": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-2.1.5.tgz",
-      "integrity": "sha512-th5xVbInVoyIoe+qY+9GCflEVezxAvztD4xpFF39SRQYqpoKD2qkmX8yv08jJG9a2SgNOCjirjJGSwg/wTrbmA=="
+      "integrity": "sha512-th5xVbInVoyIoe+qY+9GCflEVezxAvztD4xpFF39SRQYqpoKD2qkmX8yv08jJG9a2SgNOCjirjJGSwg/wTrbmA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "vue": ">= 1.0.0"
+      }
     },
-    "vue-jsoneditor": {
+    "node_modules/vue-jsoneditor": {
       "version": "1.0.13",
       "resolved": "https://registry.npmjs.org/vue-jsoneditor/-/vue-jsoneditor-1.0.13.tgz",
       "integrity": "sha512-dC4DBOmf9khDBzSauLLRI4AuoSha2A5L3q0ztR3tFDFGEYMJsk5G6ya2snyO3KkW8SyJKk+FcOfgAJtpXopa0A==",
-      "requires": {
+      "dependencies": {
         "jsoneditor": "^5.10.1",
         "vue": "^2.5.2"
+      },
+      "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
       }
     },
-    "websocket": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz",
-      "integrity": "sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==",
+    "node_modules/websocket": {
+      "version": "1.0.35",
+      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz",
+      "integrity": "sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==",
+      "license": "Apache-2.0",
       "optional": true,
-      "requires": {
+      "dependencies": {
         "bufferutil": "^4.0.1",
         "debug": "^2.2.0",
-        "es5-ext": "^0.10.50",
+        "es5-ext": "^0.10.63",
         "typedarray-to-buffer": "^3.1.5",
         "utf-8-validate": "^5.0.2",
         "yaeti": "^0.0.6"
       },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "optional": true
-        }
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "websocket-driver": {
+    "node_modules/websocket-driver": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "requires": {
+      "license": "Apache-2.0",
+      "dependencies": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "websocket-extensions": {
+    "node_modules/websocket-extensions": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "yaeti": {
+    "node_modules/websocket/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/websocket/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/yaeti": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
       "integrity": "sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==",
-      "optional": true
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.32"
+      }
     }
   }
 }
diff --git a/WebContent/resources/view.js b/WebContent/resources/view.js
index 29bc08d3f6..aa2d285508 100644
--- a/WebContent/resources/view.js
+++ b/WebContent/resources/view.js
@@ -62,6 +62,10 @@ mango.view.setMessages = function(state) {
     var warningNode = $("c"+ state.id +"Warning");
     if (warningNode && state.messages != null) {
         $set("c"+ state.id +"Messages", state.messages);
+        var warningIconNode = $("c"+ state.id +"WarningIcon");
+        if(warningIconNode) {
+            $set("c"+ state.id +"WarningIcon", state.warningIcon);
+        }
         if (state.messages)
             show(warningNode);
         else
diff --git a/build.gradle b/build.gradle
index 0aba9f146e..aa73543092 100644
--- a/build.gradle
+++ b/build.gradle
@@ -105,7 +105,13 @@ task existsScadaLTSWarFile {
     }
 }
 
-task deployTomcat(type: Copy, dependsOn: existsScadaLTSWarFile) {
+task deployTomcat(type: Copy, dependsOn: [war, existsScadaLTSWarFile]) {
+    from "build/libs/"
+    into System.getenv("CATALINA_HOME")+ "/webapps"
+    include('Scada-LTS.war')
+}
+
+task deployTomcatDev(type: Copy, dependsOn: [warDev, existsScadaLTSWarFile]) {
     from "build/libs/"
     into System.getenv("CATALINA_HOME")+ "/webapps"
     include('Scada-LTS.war')
@@ -146,18 +152,26 @@ task stopDebug(type: Exec) {
 }
 
 task buildRun(type: GradleBuild) {
-    tasks = ['clearTomcat', 'clearProject', 'test', 'war', 'deployTomcat', 'run']
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'war', 'deployTomcat', 'run']
 }
 
 task buildRunDebug(type: GradleBuild) {
-    tasks = ['clearTomcat', 'clearProject', 'test', 'testUi', 'warDev', 'deployTomcat', 'runDebug']
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'war', 'deployTomcat', 'runDebug']
 }
 
 task buildRunDebugDev(type: GradleBuild) {
-    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'testUi', 'warDev', 'deployTomcat', 'runDebug']
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'warDev', 'deployTomcatDev', 'runDebug']
 }
 
 task buildRunDebugProd(type: GradleBuild) {
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'war', 'deployTomcat', 'runDebug']
+}
+
+task buildRunDebugDevTestUi(type: GradleBuild) {
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'testUi', 'warDev', 'deployTomcatDev', 'runDebug']
+}
+
+task buildRunDebugProdTestUi(type: GradleBuild) {
     tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'testUi', 'war', 'deployTomcat', 'runDebug']
 }
 
@@ -221,14 +235,23 @@ test {
         includeTestsMatching "com.serotonin.mango.vo.report.ImageChartUtilsTestsSuite"
         includeTestsMatching "org.scada_lts.serorepl.utils.StringUtilsTestsSuite"
         includeTestsMatching "org.scada_lts.monitor.ConcurrentMonitoredValuesTest"
+        includeTestsMatching "com.serotonin.mango.rt.dataSource.DataPointUnreliableUtilsTest"
+        includeTestsMatching "com.serotonin.mango.rt.dataSource.InitializeDataSourceRtTestsSuite"
         includeTestsMatching "com.serotonin.mango.util.AddLimitIfWithoutSqlDataSourceUtilsTest"
         includeTestsMatching "com.serotonin.mango.util.StartStopDataPointsUtilsTestsSuite"
         includeTestsMatching "org.scada_lts.utils.BlockingQueuesUtilsTest"
+        includeTestsMatching "org.scada_lts.web.security.XssProtectHtmlEscapeUtilsTest"
+        includeTestsMatching "org.scada_lts.web.security.XssUtilsTestsSuite"
+        includeTestsMatching "org.scada_lts.web.mvc.api.validation.css.CssValidatorTestsSuite"
+        includeTestsMatching "org.scada_lts.web.beans.validation.xss.XssValidatorTestsSuite"
+        includeTestsMatching "org.scada_lts.utils.CyclicDependencyValidationUtilsTest"
     }
 
+    failFast = true
+
     testLogging {
 
-        //exceptionFormat = "full"
+        exceptionFormat = "full"
         showStandardStreams = true
 
         afterTest { desc, result ->
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..aa798a0d60
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,9 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+org.gradle.caching=true
+org.gradle.console=verbose
\ No newline at end of file
diff --git a/scadalts-ui/.gitignore b/scadalts-ui/.gitignore
index bdc9cf4aed..a7c1af6302 100644
--- a/scadalts-ui/.gitignore
+++ b/scadalts-ui/.gitignore
@@ -29,5 +29,9 @@ test-results.xml
 *.sw?
 
 node_modules/*
-!@min-gb/
-
+!node_modules/@min-gb
+node_modules/@min-gb/vuejs-components/*
+!node_modules/@min-gb/vuejs-components/dist
+!node_modules/@min-gb/vuejs-components/src
+!node_modules/@min-gb/vuejs-components/public
+!node_modules/@min-gb/vuejs-components/*.*
diff --git a/scadalts-ui/cypress.config.js b/scadalts-ui/cypress.config.js
new file mode 100644
index 0000000000..b2cf7d9e8d
--- /dev/null
+++ b/scadalts-ui/cypress.config.js
@@ -0,0 +1,15 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  watchForFileChanges: false,
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://localhost:8080/Scada-LTS',
+    fixturesFolder: './cypress/fixtures',
+    specPattern: './cypress/integration'
+  },
+})
diff --git a/scadalts-ui/cypress.json b/scadalts-ui/cypress.json
deleted file mode 100644
index d517071c47..0000000000
--- a/scadalts-ui/cypress.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"baseUrl": "http://localhost:8080/Scada-LTS",
-	"watchForFileChanges": false
-}
diff --git a/scadalts-ui/cypress/integration/ModernUI/alarm_notifications.spec.js b/scadalts-ui/cypress/integration/ModernUI/alarm_notifications.cy.js
similarity index 94%
rename from scadalts-ui/cypress/integration/ModernUI/alarm_notifications.spec.js
rename to scadalts-ui/cypress/integration/ModernUI/alarm_notifications.cy.js
index 2a2e3df6ca..828ce1048a 100644
--- a/scadalts-ui/cypress/integration/ModernUI/alarm_notifications.spec.js
+++ b/scadalts-ui/cypress/integration/ModernUI/alarm_notifications.cy.js
@@ -3,14 +3,17 @@ before(() => {
 	cy.fixture('AlarmNotifications/BasicConfiguration').then((configuration) => {
 		cy.loadConfiguration(configuration);
 		cy.visit('app.shtm#/alarm-notifications');
+		cy.wait(500);
 	});
 });
 
 after(() => {
 	cy.restLogin();
 	cy.visit('data_sources.shtm');
+	cy.wait(500);
 	cy.get('img[src="images/icon_ds_delete.png"]').click({ multiple: true });
 	cy.visit('mailing_lists.shtm');
+	cy.wait(500);
 	for (let i = 0; i < 6; i++) {
 		cy.get('#mailingListsTable > tbody:nth-of-type(2)').click();
 		cy.get('#mailingListDetails #deleteMailingListImg').click();
@@ -27,6 +30,8 @@ after(() => {
 context('Scenario - PLC Alarm Page validation', () => {
 	describe('Test - Validate visible elements', () => {
 		it('Is Header displayed properly', () => {
+			cy.restLogin();
+			cy.visit('app.shtm#/alarm-notifications');
 			cy.get('h1').contains('PLC Alarms Notification List');
 			cy.get(
 				'.v-main__wrap > .container .container > .row .col:nth-of-type(2) .mdi-pencil',
@@ -43,6 +48,8 @@ context('Scenario - PLC Alarm Page validation', () => {
 		});
 
 		it('Is Mailing List select list rendered properly', () => {
+			cy.restLogin();
+			cy.visit('app.shtm#/alarm-notifications');
 			cy.get(
 				'.v-main__wrap > .container .container > .row .col:nth-of-type(3) .v-select',
 			).trigger('click');
@@ -53,7 +60,8 @@ context('Scenario - PLC Alarm Page validation', () => {
 		});
 
 		it('Is Alarm Data Source List rendered properly', () => {
-			cy.restLogin();
+            cy.restLogin();
+            cy.visit('app.shtm#/alarm-notifications');
 			cy.get(
 				'.v-main__wrap > .container .container > .row .col:nth-of-type(3) .v-select',
 			).trigger('click');
@@ -69,7 +77,8 @@ context('Scenario - PLC Alarm Page validation', () => {
 		});
 
 		it('Is Alarm Data Point List rendered properly', () => {
-			cy.restLogin();
+            cy.restLogin();
+            cy.visit('app.shtm#/alarm-notifications');
 			cy.get('.v-treeview > .v-treeview-node:nth-of-type(1) button').trigger('click');
 			cy.get('.v-treeview > .v-treeview-node:nth-of-type(1) > .v-treeview-node__children')
 				.find('div.v-treeview-node')
@@ -81,6 +90,8 @@ context('Scenario - PLC Alarm Page validation', () => {
 		});
 
 		it('Is Handler Settings rendered properly', () => {
+            cy.restLogin();
+            cy.visit('app.shtm#/alarm-notifications');
 			cy.get('button .mdi-pencil').trigger('click');
 			cy.get('.v-dialog--active .v-card__title').contains('Settings');
 			cy.get('.v-dialog--active .v-card__text > div:nth-of-type(1) h3').contains(
@@ -112,6 +123,7 @@ context('Scenario - PLC Alarm Page validation', () => {
 	describe('Test - Basic configuration', () => {
 		it('Create E-mail communication channel', () => {
 			cy.restLogin();
+			cy.visit('app.shtm#/alarm-notifications');
 			cy.get(
 				'.v-treeview > .v-treeview-node:nth-of-type(1) > .v-treeview-node__children > div.v-treeview-node:nth-of-type(1) .v-treeview-node__append .v-input--checkbox:nth-of-type(1)',
 			).trigger('click');
diff --git a/scadalts-ui/cypress/integration/ModernUI/data_point_details.spec.js b/scadalts-ui/cypress/integration/ModernUI/data_point_details.cy.js
similarity index 99%
rename from scadalts-ui/cypress/integration/ModernUI/data_point_details.spec.js
rename to scadalts-ui/cypress/integration/ModernUI/data_point_details.cy.js
index 5237345be0..44f04c9db4 100644
--- a/scadalts-ui/cypress/integration/ModernUI/data_point_details.spec.js
+++ b/scadalts-ui/cypress/integration/ModernUI/data_point_details.cy.js
@@ -24,6 +24,7 @@ context('Scenario - Data Point List validation', () => {
 	}
 
 	before(() => {
+	    cy.restLogin();
 		cy.visit('/app.shtm#/datapoint-list');
 	});
 
diff --git a/scadalts-ui/cypress/integration/ModernUI/recipient_list.spec.js b/scadalts-ui/cypress/integration/ModernUI/recipient_list.cy.js
similarity index 100%
rename from scadalts-ui/cypress/integration/ModernUI/recipient_list.spec.js
rename to scadalts-ui/cypress/integration/ModernUI/recipient_list.cy.js
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/datasource_creation.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/datasource_creation.cy.js
similarity index 100%
rename from scadalts-ui/cypress/integration/ScadaLTS_Views/datasource_creation.spec.js
rename to scadalts-ui/cypress/integration/ScadaLTS_Views/datasource_creation.cy.js
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.cy.js
similarity index 84%
rename from scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.spec.js
rename to scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.cy.js
index b20b041186..9c9173d55d 100644
--- a/scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.spec.js
+++ b/scadalts-ui/cypress/integration/ScadaLTS_Views/modern_charts.cy.js
@@ -8,16 +8,6 @@ context('Verify Modern Watch List Page and Modern Charts', () => {
 		cy.location('pathname').should('include', 'watch_list');
 	});
 
-	describe('Modern Watch List', function () {
-		it('Open Modern Watch List Page', function () {
-			cy.visit('/modern_watch_list.shtm');
-			cy.location('pathname').should('include', 'modern_watch_list.shtm');
-		});
-		it('Validate Modern Charts Vue component exist', function () {
-			cy.get('.smallTitle').should('contain', 'Modern Chart');
-		});
-	});
-
 	describe('Chart with 1 datapoint', function () {
 		it('Create chart', function () {
 			cy.request('/api/auth/admin/admin');
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/system_settings.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/system_settings.cy.js
similarity index 100%
rename from scadalts-ui/cypress/integration/ScadaLTS_Views/system_settings.spec.js
rename to scadalts-ui/cypress/integration/ScadaLTS_Views/system_settings.cy.js
diff --git a/scadalts-ui/cypress/integration/ScadaLTS_Views/watch_list.spec.js b/scadalts-ui/cypress/integration/ScadaLTS_Views/watch_list.cy.js
similarity index 100%
rename from scadalts-ui/cypress/integration/ScadaLTS_Views/watch_list.spec.js
rename to scadalts-ui/cypress/integration/ScadaLTS_Views/watch_list.cy.js
diff --git a/scadalts-ui/cypress/support/commands.js b/scadalts-ui/cypress/support/commands.js
index 817a073ca3..13675a9a43 100644
--- a/scadalts-ui/cypress/support/commands.js
+++ b/scadalts-ui/cypress/support/commands.js
@@ -13,8 +13,8 @@ Cypress.Commands.add('login', (username = 'admin', password = 'admin') => {
 		autoEnd: false,
 	});
 
-	cy.server();
-	cy.route('POST', '**/MiscDwr.initializeLongPoll.dwr').as('loginUser');
+	cy.intercept('POST', '**/MiscDwr.initializeLongPoll.dwr').as('loginUser');
+
 
 	cy.location('pathname', { log: false }).then((currentPath) => {
 		if (currentPath !== loginPath) {
@@ -74,12 +74,6 @@ Cypress.Commands.add('loadConfiguration', (configuration) => {
 		autoEnd: false,
 	});
 
-	cy.server({
-		whitelist: () => {
-			return true;
-		},
-	});
-
 	cy.visit('/emport.shtm', { log: false });
 	log.snapshot('before');
 	cy.get('#emportData', { log: false })
diff --git a/scadalts-ui/cypress/support/index.js b/scadalts-ui/cypress/support/e2e.js
similarity index 100%
rename from scadalts-ui/cypress/support/index.js
rename to scadalts-ui/cypress/support/e2e.js
diff --git a/scadalts-ui/package-lock.json b/scadalts-ui/package-lock.json
index c0f633cc72..63a3bc2614 100644
--- a/scadalts-ui/package-lock.json
+++ b/scadalts-ui/package-lock.json
@@ -1,25 +1,99 @@
 {
 	"name": "scadalts-ui",
-	"version": "0.5.2",
-	"lockfileVersion": 1,
+	"version": "0.6.0",
+	"lockfileVersion": 3,
 	"requires": true,
-	"dependencies": {
-		"@achrinza/node-ipc": {
+	"packages": {
+		"": {
+			"name": "scadalts-ui",
+			"version": "0.6.0",
+			"dependencies": {
+				"@amcharts/amcharts4": "4.8.9",
+				"@fortawesome/fontawesome-svg-core": "1.2.29",
+				"@fortawesome/free-solid-svg-icons": "5.13.1",
+				"@fortawesome/vue-fontawesome": "0.1.10",
+				"@mdi/font": "6.5.95",
+				"@min-gb/vuejs-components": "0.0.7",
+				"ajv": "6.12.3",
+				"axios": "0.21.4",
+				"bootstrap": "3.4.1",
+				"core-js": "2.6.5",
+				"css-loader": "3.2.0",
+				"decimal-format": "2.0.2",
+				"install": "0.13.0",
+				"moment": "2.22.2",
+				"roboto-fontface": "0.10.0",
+				"sinon": "11.1.1",
+				"sockjs-client": "1.6.0",
+				"svg.js": "2.7.1",
+				"uiv": "0.27.0",
+				"underscore": "1.13.1",
+				"util": "0.12.3",
+				"vue": "2.6.10",
+				"vue-color-picker-wheel": "0.4.3",
+				"vue-cookie": "1.1.4",
+				"vue-dayjs-plugin": "1.0.0",
+				"vue-i18n": "8.17.3",
+				"vue-jsoneditor": "1.0.13",
+				"vue-loader": "15.7.1",
+				"vue-lodash": "2.0.2",
+				"vue-property-decorator": "7.3.0",
+				"vue-router": "3.0.1",
+				"vue-underscore": "0.1.4",
+				"vuedraggable": "2.24.3",
+				"vuejs-datepicker": "1.6.2",
+				"vuejs-logger": "1.5.3",
+				"vuetify": "2.4.8",
+				"vuex": "3.0.1",
+				"webstomp-client": "1.2.6"
+			},
+			"devDependencies": {
+				"@intlify/vue-i18n-loader": "1.0.0",
+				"@vue/cli-plugin-babel": "3.11.0",
+				"@vue/cli-plugin-e2e-cypress": "3.11.0",
+				"@vue/cli-plugin-eslint": "3.11.0",
+				"@vue/cli-plugin-unit-mocha": "3.11.0",
+				"@vue/cli-service": "4.3.1",
+				"@vue/test-utils": "1.3.6",
+				"ag-grid-community": "32.2.0",
+				"babel-eslint": "10.0.1",
+				"chai": "4.1.2",
+				"cypress": "13.13.3",
+				"eslint": "5.16.0",
+				"eslint-plugin-vue": "5.0.0",
+				"http-proxy-middleware": "0.20.0",
+				"http-proxy-middleware-secure-cookies": "0.1.8",
+				"mocha-junit-reporter": "2.0.0",
+				"prettier": "2.2.1",
+				"sass": "1.19.0",
+				"sass-loader": "8.0.0",
+				"vue-cli-plugin-i18n": "1.0.1",
+				"vue-cli-plugin-vuetify": "2.0.8",
+				"vue-template-compiler": "2.6.10",
+				"vuetify-loader": "1.7.2"
+			}
+		},
+		"node_modules/@achrinza/node-ipc": {
 			"version": "9.2.2",
 			"resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz",
 			"integrity": "sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@node-ipc/js-queue": "2.0.3",
 				"event-pubsub": "4.3.0",
 				"js-message": "1.0.7"
+			},
+			"engines": {
+				"node": "8 || 10 || 12 || 14 || 16 || 17"
 			}
 		},
-		"@amcharts/amcharts4": {
+		"node_modules/@amcharts/amcharts4": {
 			"version": "4.8.9",
 			"resolved": "https://registry.npmjs.org/@amcharts/amcharts4/-/amcharts4-4.8.9.tgz",
 			"integrity": "sha512-0SBg/hgsjU7nPTTUP8imHURaMKMZ2q/uhS2I/S9t2vbEFmtvq3NGl9QUH0Mc+DrdpcP809qdMSR2BOrPhOapKA==",
-			"requires": {
+			"license": "SEE LICENSE IN LICENSE",
+			"dependencies": {
 				"@types/regression": "^2.0.0",
 				"canvg": "^3.0.4",
 				"css-element-queries": "1.2.1",
@@ -33,822 +107,1156 @@
 				"xlsx": "^0.15.4"
 			}
 		},
-		"@ampproject/remapping": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-			"integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+		"node_modules/@ampproject/remapping": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
 			"dev": true,
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.1.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"@babel/code-frame": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-			"integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+		"node_modules/@babel/code-frame": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+			"integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
 			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/highlight": "^7.24.7",
+				"picocolors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/compat-data": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz",
-			"integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==",
-			"dev": true
+		"node_modules/@babel/compat-data": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+			"integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"@babel/core": {
-			"version": "7.19.3",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz",
-			"integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==",
-			"dev": true,
-			"requires": {
-				"@ampproject/remapping": "^2.1.0",
-				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.3",
-				"@babel/helper-compilation-targets": "^7.19.3",
-				"@babel/helper-module-transforms": "^7.19.0",
-				"@babel/helpers": "^7.19.0",
-				"@babel/parser": "^7.19.3",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.3",
-				"@babel/types": "^7.19.3",
-				"convert-source-map": "^1.7.0",
+		"node_modules/@babel/core": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+			"integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@ampproject/remapping": "^2.2.0",
+				"@babel/code-frame": "^7.24.7",
+				"@babel/generator": "^7.25.0",
+				"@babel/helper-compilation-targets": "^7.25.2",
+				"@babel/helper-module-transforms": "^7.25.2",
+				"@babel/helpers": "^7.25.0",
+				"@babel/parser": "^7.25.0",
+				"@babel/template": "^7.25.0",
+				"@babel/traverse": "^7.25.2",
+				"@babel/types": "^7.25.2",
+				"convert-source-map": "^2.0.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.1",
-				"semver": "^6.3.0"
+				"json5": "^2.2.3",
+				"semver": "^6.3.1"
 			},
-			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"json5": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-					"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
 			}
 		},
-		"@babel/generator": {
-			"version": "7.19.5",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.5.tgz",
-			"integrity": "sha512-DxbNz9Lz4aMZ99qPpO1raTbcrI1ZeYh+9NR9qhfkQIbFtVEqotHojEBxHzmxhVONkGt6VyrqVQcgpefMy9pqcg==",
+		"node_modules/@babel/generator": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+			"integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.19.4",
-				"@jridgewell/gen-mapping": "^0.3.2",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.25.6",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
 				"jsesc": "^2.5.1"
 			},
-			"dependencies": {
-				"@jridgewell/gen-mapping": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-					"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-					"dev": true,
-					"requires": {
-						"@jridgewell/set-array": "^1.0.1",
-						"@jridgewell/sourcemap-codec": "^1.4.10",
-						"@jridgewell/trace-mapping": "^0.3.9"
-					}
-				}
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-annotate-as-pure": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-			"integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+		"node_modules/@babel/helper-annotate-as-pure": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+			"integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-			"integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
+			"integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-explode-assignable-expression": "^7.18.6",
-				"@babel/types": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-compilation-targets": {
-			"version": "7.19.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz",
-			"integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==",
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+			"integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
 			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.19.3",
-				"@babel/helper-validator-option": "^7.18.6",
-				"browserslist": "^4.21.3",
-				"semver": "^6.3.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/compat-data": "^7.25.2",
+				"@babel/helper-validator-option": "^7.24.8",
+				"browserslist": "^4.23.1",
+				"lru-cache": "^5.1.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-create-class-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+		"node_modules/@babel/helper-create-class-features-plugin": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz",
+			"integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-replace-supers": "^7.18.9",
-				"@babel/helper-split-export-declaration": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-member-expression-to-functions": "^7.24.8",
+				"@babel/helper-optimise-call-expression": "^7.24.7",
+				"@babel/helper-replace-supers": "^7.25.0",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+				"@babel/traverse": "^7.25.4",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/helper-create-regexp-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+		"node_modules/@babel/helper-create-regexp-features-plugin": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz",
+			"integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"regexpu-core": "^5.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"regexpu-core": "^5.3.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/helper-define-polyfill-provider": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-			"integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+		"node_modules/@babel/helper-define-polyfill-provider": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+			"integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-compilation-targets": "^7.17.7",
-				"@babel/helper-plugin-utils": "^7.16.7",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-compilation-targets": "^7.22.6",
+				"@babel/helper-plugin-utils": "^7.22.5",
 				"debug": "^4.1.1",
 				"lodash.debounce": "^4.0.8",
-				"resolve": "^1.14.2",
-				"semver": "^6.1.2"
+				"resolve": "^1.14.2"
 			},
-			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
-		"@babel/helper-environment-visitor": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-			"integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-			"dev": true
-		},
-		"@babel/helper-explode-assignable-expression": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-			"integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
+		"node_modules/@babel/helper-environment-visitor": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+			"integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-function-name": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-			"integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+		"node_modules/@babel/helper-member-expression-to-functions": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz",
+			"integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==",
 			"dev": true,
-			"requires": {
-				"@babel/template": "^7.18.10",
-				"@babel/types": "^7.19.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/traverse": "^7.24.8",
+				"@babel/types": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-hoist-variables": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-			"integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+			"integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-member-expression-to-functions": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-			"integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+			"integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.24.7",
+				"@babel/helper-simple-access": "^7.24.7",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"@babel/traverse": "^7.25.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/helper-module-imports": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-			"integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+		"node_modules/@babel/helper-optimise-call-expression": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
+			"integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-module-transforms": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-			"integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+		"node_modules/@babel/helper-plugin-utils": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+			"integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-simple-access": "^7.18.6",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-optimise-call-expression": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-			"integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+		"node_modules/@babel/helper-remap-async-to-generator": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz",
+			"integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-wrap-function": "^7.25.0",
+				"@babel/traverse": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/helper-plugin-utils": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-			"integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
-			"dev": true
-		},
-		"@babel/helper-remap-async-to-generator": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-			"integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+		"node_modules/@babel/helper-replace-supers": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz",
+			"integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-wrap-function": "^7.18.9",
-				"@babel/types": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-member-expression-to-functions": "^7.24.8",
+				"@babel/helper-optimise-call-expression": "^7.24.7",
+				"@babel/traverse": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/helper-replace-supers": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-			"integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+		"node_modules/@babel/helper-simple-access": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+			"integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/traverse": "^7.19.1",
-				"@babel/types": "^7.19.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-simple-access": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-			"integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+		"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
+			"integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.19.4"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
-			"integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.9"
+		"node_modules/@babel/helper-string-parser": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+			"integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-			"integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.6"
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+			"integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-string-parser": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-			"integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
-			"dev": true
-		},
-		"@babel/helper-validator-identifier": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-			"integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
-			"dev": true
-		},
-		"@babel/helper-validator-option": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-			"integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-			"dev": true
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+			"integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"@babel/helper-wrap-function": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-			"integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+		"node_modules/@babel/helper-wrap-function": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz",
+			"integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/template": "^7.25.0",
+				"@babel/traverse": "^7.25.0",
+				"@babel/types": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helpers": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz",
-			"integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==",
+		"node_modules/@babel/helpers": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+			"integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
 			"dev": true,
-			"requires": {
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.4",
-				"@babel/types": "^7.19.4"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/template": "^7.25.0",
+				"@babel/types": "^7.25.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/highlight": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-			"integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+		"node_modules/@babel/highlight": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+			"integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"chalk": "^2.4.2",
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/parser": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz",
-			"integrity": "sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA=="
+		"node_modules/@babel/parser": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+			"integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.25.6"
+			},
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
 		},
-		"@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-			"integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
+		"node_modules/@babel/plugin-proposal-async-generator-functions": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
+			"integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.19.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/helper-remap-async-to-generator": "^7.18.9",
 				"@babel/plugin-syntax-async-generators": "^7.8.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-class-properties": {
+		"node_modules/@babel/plugin-proposal-class-properties": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
 			"integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-create-class-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-decorators": {
-			"version": "7.19.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.3.tgz",
-			"integrity": "sha512-MbgXtNXqo7RTKYIXVchVJGPvaVufQH3pxvQyfbGvNw1DObIhph+PesYXJTcd8J4DdWibvf6Z2eanOyItX8WnJg==",
+		"node_modules/@babel/plugin-proposal-decorators": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.7.tgz",
+			"integrity": "sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-replace-supers": "^7.19.1",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/plugin-syntax-decorators": "^7.19.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-create-class-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-decorators": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-json-strings": {
+		"node_modules/@babel/plugin-proposal-json-strings": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
 			"integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-json-strings instead.",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/plugin-syntax-json-strings": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
-			"integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
+		"node_modules/@babel/plugin-proposal-object-rest-spread": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
+			"integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.",
 			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.19.4",
-				"@babel/helper-compilation-targets": "^7.19.3",
-				"@babel/helper-plugin-utils": "^7.19.0",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/compat-data": "^7.20.5",
+				"@babel/helper-compilation-targets": "^7.20.7",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.18.8"
+				"@babel/plugin-transform-parameters": "^7.20.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-optional-catch-binding": {
+		"node_modules/@babel/plugin-proposal-optional-catch-binding": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
 			"integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-unicode-property-regex": {
+		"node_modules/@babel/plugin-proposal-unicode-property-regex": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
 			"integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-async-generators": {
+		"node_modules/@babel/plugin-syntax-async-generators": {
 			"version": "7.8.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
 			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-decorators": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
-			"integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
+		"node_modules/@babel/plugin-syntax-decorators": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.7.tgz",
+			"integrity": "sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-dynamic-import": {
+		"node_modules/@babel/plugin-syntax-dynamic-import": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
 			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-json-strings": {
+		"node_modules/@babel/plugin-syntax-json-strings": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
 			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-jsx": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-			"integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+		"node_modules/@babel/plugin-syntax-jsx": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+			"integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-object-rest-spread": {
+		"node_modules/@babel/plugin-syntax-object-rest-spread": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
 			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-optional-catch-binding": {
+		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
 			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-arrow-functions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-			"integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+		"node_modules/@babel/plugin-transform-arrow-functions": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
+			"integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-async-to-generator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-			"integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+		"node_modules/@babel/plugin-transform-async-to-generator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
+			"integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-remap-async-to-generator": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-remap-async-to-generator": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-			"integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+		"node_modules/@babel/plugin-transform-block-scoped-functions": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
+			"integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-block-scoping": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz",
-			"integrity": "sha512-934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ==",
+		"node_modules/@babel/plugin-transform-block-scoping": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz",
+			"integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-classes": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-			"integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
+		"node_modules/@babel/plugin-transform-classes": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz",
+			"integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-compilation-targets": "^7.19.0",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-replace-supers": "^7.18.9",
-				"@babel/helper-split-export-declaration": "^7.18.6",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-compilation-targets": "^7.25.2",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-replace-supers": "^7.25.0",
+				"@babel/traverse": "^7.25.4",
 				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-computed-properties": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-			"integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+		"node_modules/@babel/plugin-transform-computed-properties": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
+			"integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/template": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-destructuring": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz",
-			"integrity": "sha512-t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA==",
+		"node_modules/@babel/plugin-transform-destructuring": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz",
+			"integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-dotall-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-			"integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+		"node_modules/@babel/plugin-transform-dotall-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
+			"integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-duplicate-keys": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-			"integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+		"node_modules/@babel/plugin-transform-duplicate-keys": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
+			"integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-			"integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+		"node_modules/@babel/plugin-transform-exponentiation-operator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
+			"integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-for-of": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-			"integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+		"node_modules/@babel/plugin-transform-for-of": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
+			"integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-function-name": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-			"integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+		"node_modules/@babel/plugin-transform-function-name": {
+			"version": "7.25.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz",
+			"integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-compilation-targets": "^7.18.9",
-				"@babel/helper-function-name": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-compilation-targets": "^7.24.8",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/traverse": "^7.25.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-literals": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-			"integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+		"node_modules/@babel/plugin-transform-literals": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz",
+			"integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-modules-amd": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
-			"integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
+		"node_modules/@babel/plugin-transform-modules-amd": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
+			"integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
-			"integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
+		"node_modules/@babel/plugin-transform-modules-commonjs": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz",
+			"integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-simple-access": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.24.8",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-simple-access": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-modules-systemjs": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
-			"integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
+		"node_modules/@babel/plugin-transform-modules-systemjs": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz",
+			"integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-hoist-variables": "^7.18.6",
-				"@babel/helper-module-transforms": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.25.0",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"@babel/traverse": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-modules-umd": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-			"integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+		"node_modules/@babel/plugin-transform-modules-umd": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
+			"integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-			"integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+		"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
+			"integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/plugin-transform-new-target": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-			"integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+		"node_modules/@babel/plugin-transform-new-target": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
+			"integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-object-super": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-			"integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+		"node_modules/@babel/plugin-transform-object-super": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
+			"integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-replace-supers": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-replace-supers": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-parameters": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-			"integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+		"node_modules/@babel/plugin-transform-parameters": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
+			"integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-regenerator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-			"integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+		"node_modules/@babel/plugin-transform-regenerator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
+			"integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"regenerator-transform": "^0.15.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"regenerator-transform": "^0.15.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-runtime": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.1.tgz",
-			"integrity": "sha512-2nJjTUFIzBMP/f/miLxEK9vxwW/KUXsdvN4sR//TmuDhe6yU2h57WmIOE12Gng3MDP/xpjUV/ToZRdcf8Yj4fA==",
+		"node_modules/@babel/plugin-transform-runtime": {
+			"version": "7.25.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.4.tgz",
+			"integrity": "sha512-8hsyG+KUYGY0coX6KUCDancA0Vw225KJ2HJO0yCNr1vq5r+lJTleDaJf0K7iOhjw4SWhu03TMBzYTJ9krmzULQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"babel-plugin-polyfill-corejs2": "^0.3.3",
-				"babel-plugin-polyfill-corejs3": "^0.6.0",
-				"babel-plugin-polyfill-regenerator": "^0.4.1",
-				"semver": "^6.3.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.6",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-shorthand-properties": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-			"integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+		"node_modules/@babel/plugin-transform-shorthand-properties": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
+			"integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-spread": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-			"integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+		"node_modules/@babel/plugin-transform-spread": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
+			"integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-sticky-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-			"integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+		"node_modules/@babel/plugin-transform-sticky-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
+			"integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-template-literals": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-			"integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-template-literals": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
+			"integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-typeof-symbol": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-			"integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+		"node_modules/@babel/plugin-transform-typeof-symbol": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz",
+			"integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-unicode-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-			"integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+		"node_modules/@babel/plugin-transform-unicode-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
+			"integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/preset-env": {
+		"node_modules/@babel/preset-env": {
 			"version": "7.3.4",
 			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.4.tgz",
 			"integrity": "sha512-2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-module-imports": "^7.0.0",
 				"@babel/helper-plugin-utils": "^7.0.0",
 				"@babel/plugin-proposal-async-generator-functions": "^7.2.0",
@@ -893,687 +1301,1012 @@
 				"js-levenshtein": "^1.1.3",
 				"semver": "^5.3.0"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				}
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/runtime": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz",
-			"integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==",
-			"requires": {
-				"regenerator-runtime": "^0.13.4"
+		"node_modules/@babel/preset-env/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver"
 			}
 		},
-		"@babel/runtime-corejs2": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.19.4.tgz",
-			"integrity": "sha512-CI3EpUqXzoPOKa7hOzObVDh9RAz2j0fNpW56u85/8oY9+27od2QXwtwJ12LW3aZ3jqmc5lu91czL/79wFkb41w==",
+		"node_modules/@babel/regjsgen": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
 			"dev": true,
-			"requires": {
-				"core-js": "^2.6.12",
-				"regenerator-runtime": "^0.13.4"
+			"license": "MIT"
+		},
+		"node_modules/@babel/runtime": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
+			"integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
+			"license": "MIT",
+			"dependencies": {
+				"regenerator-runtime": "^0.14.0"
 			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/runtime-corejs2": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.25.6.tgz",
+			"integrity": "sha512-24uCmOJPrsnS7HtRamCibYabHRV0bscPJNFFcyKgj7FqUA0V5XcbZUmz9PVNDW4L+euMsZtCIetU1LxTmUaIlA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"core-js": {
-					"version": "2.6.12",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-					"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-					"dev": true
-				}
+				"core-js": "^2.6.12",
+				"regenerator-runtime": "^0.14.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/template": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-			"integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+		"node_modules/@babel/runtime-corejs2/node_modules/core-js": {
+			"version": "2.6.12",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+			"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+			"deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT"
+		},
+		"node_modules/@babel/template": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+			"integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
 			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.18.6",
-				"@babel/parser": "^7.18.10",
-				"@babel/types": "^7.18.10"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.24.7",
+				"@babel/parser": "^7.25.0",
+				"@babel/types": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/traverse": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.4.tgz",
-			"integrity": "sha512-w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g==",
+		"node_modules/@babel/traverse": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+			"integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
 			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.4",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-hoist-variables": "^7.18.6",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/parser": "^7.19.4",
-				"@babel/types": "^7.19.4",
-				"debug": "^4.1.0",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.24.7",
+				"@babel/generator": "^7.25.6",
+				"@babel/parser": "^7.25.6",
+				"@babel/template": "^7.25.0",
+				"@babel/types": "^7.25.6",
+				"debug": "^4.3.1",
 				"globals": "^11.1.0"
 			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.25.6",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+			"integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
+				"@babel/helper-string-parser": "^7.24.8",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"to-fast-properties": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/types": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz",
-			"integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==",
+		"node_modules/@colors/colors": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+			"integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-string-parser": "^7.19.4",
-				"@babel/helper-validator-identifier": "^7.19.1",
-				"to-fast-properties": "^2.0.0"
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.1.90"
 			}
 		},
-		"@cypress/listr-verbose-renderer": {
+		"node_modules/@cypress/listr-verbose-renderer": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
 			"integrity": "sha512-EDiBsVPWC27DDLEJCo+dpl9ODHhdrwU57ccr9tspwCdG2ni0QVkf6LF0FGbhfujcjPxnXLIwsaks4sOrwrA4Qw==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"chalk": "^1.1.3",
 				"cli-cursor": "^1.0.2",
 				"date-fns": "^1.27.2",
 				"figures": "^1.7.0"
 			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-					"integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^1.0.1"
-					}
-				},
-				"onetime": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
-					"dev": true
-				},
-				"restore-cursor": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-					"integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
-					"dev": true,
-					"requires": {
-						"exit-hook": "^1.0.0",
-						"onetime": "^1.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-					"dev": true
-				}
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/cli-cursor": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+			"integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"restore-cursor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/figures": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+			"integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5",
+				"object-assign": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/onetime": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+			"integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/restore-cursor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+			"integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"exit-hook": "^1.0.0",
+				"onetime": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"@cypress/xvfb": {
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@cypress/listr-verbose-renderer/node_modules/supports-color": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/@cypress/request": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.5.tgz",
+			"integrity": "sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~4.0.0",
+				"http-signature": "~1.4.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"performance-now": "^2.1.0",
+				"qs": "6.13.0",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "^4.1.3",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^8.3.2"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/@cypress/xvfb": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
 			"integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"debug": "^3.1.0",
 				"lodash.once": "^4.1.1"
 			}
 		},
-		"@fortawesome/fontawesome-common-types": {
+		"node_modules/@cypress/xvfb/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/@fortawesome/fontawesome-common-types": {
 			"version": "0.2.36",
 			"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
-			"integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
+			"integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
+			"hasInstallScript": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"@fortawesome/fontawesome-svg-core": {
+		"node_modules/@fortawesome/fontawesome-svg-core": {
 			"version": "1.2.29",
 			"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.29.tgz",
 			"integrity": "sha512-xmPmP2t8qrdo8RyKihTkGb09RnZoc+7HFBCnr0/6ZhStdGDSLeEd7ajV181+2W29NWIFfylO13rU+s3fpy3cnA==",
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@fortawesome/fontawesome-common-types": "^0.2.29"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"@fortawesome/free-solid-svg-icons": {
+		"node_modules/@fortawesome/free-solid-svg-icons": {
 			"version": "5.13.1",
 			"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.13.1.tgz",
 			"integrity": "sha512-LQH/0L1p4+rqtoSHa9qFYR84hpuRZKqaQ41cfBQx8b68p21zoWSekTAeA54I/2x9VlCHDLFlG74Nmdg4iTPQOg==",
-			"requires": {
+			"license": "(CC-BY-4.0 AND MIT)",
+			"dependencies": {
 				"@fortawesome/fontawesome-common-types": "^0.2.29"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"@fortawesome/vue-fontawesome": {
+		"node_modules/@fortawesome/vue-fontawesome": {
 			"version": "0.1.10",
 			"resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz",
-			"integrity": "sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w=="
+			"integrity": "sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==",
+			"license": "MIT",
+			"peerDependencies": {
+				"@fortawesome/fontawesome-svg-core": ">= 1.2.0 < 1.3",
+				"vue": "~2"
+			}
 		},
-		"@hapi/address": {
+		"node_modules/@hapi/address": {
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
 			"integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==",
-			"dev": true
+			"deprecated": "Moved to 'npm install @sideway/address'",
+			"dev": true,
+			"license": "BSD-3-Clause"
 		},
-		"@hapi/bourne": {
+		"node_modules/@hapi/bourne": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
 			"integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==",
-			"dev": true
+			"deprecated": "This version has been deprecated and is no longer supported or maintained",
+			"dev": true,
+			"license": "BSD-3-Clause"
 		},
-		"@hapi/hoek": {
+		"node_modules/@hapi/hoek": {
 			"version": "8.5.1",
 			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
 			"integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
-			"dev": true
+			"deprecated": "This version has been deprecated and is no longer supported or maintained",
+			"dev": true,
+			"license": "BSD-3-Clause"
 		},
-		"@hapi/joi": {
+		"node_modules/@hapi/joi": {
 			"version": "15.1.1",
 			"resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
 			"integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
+			"deprecated": "Switch to 'npm install joi'",
 			"dev": true,
-			"requires": {
+			"license": "BSD-3-Clause",
+			"dependencies": {
 				"@hapi/address": "2.x.x",
 				"@hapi/bourne": "1.x.x",
 				"@hapi/hoek": "8.x.x",
 				"@hapi/topo": "3.x.x"
 			}
 		},
-		"@hapi/topo": {
+		"node_modules/@hapi/topo": {
 			"version": "3.1.6",
 			"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
 			"integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
+			"deprecated": "This version has been deprecated and is no longer supported or maintained",
 			"dev": true,
-			"requires": {
+			"license": "BSD-3-Clause",
+			"dependencies": {
 				"@hapi/hoek": "^8.3.0"
 			}
 		},
-		"@intervolga/optimize-cssnano-plugin": {
+		"node_modules/@intervolga/optimize-cssnano-plugin": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz",
 			"integrity": "sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"cssnano": "^4.0.0",
 				"cssnano-preset-default": "^4.0.0",
 				"postcss": "^7.0.0"
 			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+			"peerDependencies": {
+				"webpack": "^4.0.0"
 			}
 		},
-		"@intlify/vue-i18n-loader": {
+		"node_modules/@intlify/vue-i18n-loader": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@intlify/vue-i18n-loader/-/vue-i18n-loader-1.0.0.tgz",
 			"integrity": "sha512-y7LlpKEQ01u7Yq14l4VNlbFYEHMmSEH1QXXASOMWspj9ZcIdCebhhvHCHqk5Oy5Epw3PtoxyRJNpb6Wle5udgA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"js-yaml": "^3.13.1",
 				"json5": "^2.1.1"
 			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@isaacs/cliui": {
+			"version": "8.0.2",
+			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+			"integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"json5": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-					"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-					"dev": true
-				}
+				"string-width": "^5.1.2",
+				"string-width-cjs": "npm:string-width@^4.2.0",
+				"strip-ansi": "^7.0.1",
+				"strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+				"wrap-ansi": "^8.1.0",
+				"wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"@jridgewell/gen-mapping": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-			"integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+		"node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
 			"dev": true,
-			"requires": {
-				"@jridgewell/set-array": "^1.0.0",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
 			}
 		},
-		"@jridgewell/resolve-uri": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-			"integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-			"dev": true
+		"node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
 		},
-		"@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-			"dev": true
+		"node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+			"version": "9.2.2",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"@jridgewell/sourcemap-codec": {
-			"version": "1.4.14",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-			"dev": true
+		"node_modules/@isaacs/cliui/node_modules/string-width": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+			"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"eastasianwidth": "^0.2.0",
+				"emoji-regex": "^9.2.2",
+				"strip-ansi": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"@jridgewell/trace-mapping": {
-			"version": "0.3.17",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-			"integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+		"node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
+			}
+		},
+		"node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+			"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^6.1.0",
+				"string-width": "^5.0.1",
+				"strip-ansi": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/@jridgewell/gen-mapping": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
 			"dev": true,
-			"requires": {
-				"@jridgewell/resolve-uri": "3.1.0",
-				"@jridgewell/sourcemap-codec": "1.4.14"
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/set-array": "^1.2.1",
+				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/resolve-uri": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/set-array": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/resolve-uri": "^3.1.0",
+				"@jridgewell/sourcemap-codec": "^1.4.14"
 			}
 		},
-		"@mdi/font": {
+		"node_modules/@mdi/font": {
 			"version": "6.5.95",
 			"resolved": "https://registry.npmjs.org/@mdi/font/-/font-6.5.95.tgz",
-			"integrity": "sha512-ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="
+			"integrity": "sha512-ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg==",
+			"license": "Apache-2.0"
 		},
-		"@min-gb/vuejs-components": {
+		"node_modules/@min-gb/vuejs-components": {
 			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/@min-gb/vuejs-components/-/vuejs-components-0.0.7.tgz",
-			"integrity": "sha512-S4av3itQw2PjNPCFzoonLU8msJmDc4iaeNU0Q1UV3OAQHBVp3szHZBVtydrwkSN9Nu8LS/ntcFqcQ4UfWngG+A==",
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"core-js": "^3.6.4",
 				"vue": "^2.6.11",
 				"vue-imask": "^6.0.5",
 				"vue-moment": "^4.1.0",
 				"vue-timers": "^2.0.4"
-			},
+			}
+		},
+		"node_modules/@min-gb/vuejs-components/node_modules/core-js": {
+			"version": "3.38.1",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
+			"integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
+			"hasInstallScript": true,
+			"license": "MIT",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/core-js"
+			}
+		},
+		"node_modules/@min-gb/vuejs-components/node_modules/vue": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+			"integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+			"deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+			"license": "MIT",
 			"dependencies": {
-				"core-js": {
-					"version": "3.25.5",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz",
-					"integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="
-				},
-				"vue": {
-					"version": "2.7.13",
-					"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz",
-					"integrity": "sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==",
-					"requires": {
-						"@vue/compiler-sfc": "2.7.13",
-						"csstype": "^3.1.0"
-					}
-				}
+				"@vue/compiler-sfc": "2.7.16",
+				"csstype": "^3.1.0"
 			}
 		},
-		"@mrmlnc/readdir-enhanced": {
+		"node_modules/@mrmlnc/readdir-enhanced": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
 			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"call-me-maybe": "^1.0.1",
 				"glob-to-regexp": "^0.3.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@node-ipc/js-queue": {
+		"node_modules/@node-ipc/js-queue": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
 			"integrity": "sha512-fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"easy-stack": "1.0.1"
+			},
+			"engines": {
+				"node": ">=1.0.0"
 			}
 		},
-		"@nodelib/fs.stat": {
+		"node_modules/@nodelib/fs.stat": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
 			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 6"
+			}
 		},
-		"@samverschueren/stream-to-observable": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
-			"integrity": "sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==",
+		"node_modules/@one-ini/wasm": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
+			"integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@pkgjs/parseargs": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+			"integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
 			"dev": true,
-			"requires": {
-				"any-observable": "^0.3.0"
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=14"
 			}
 		},
-		"@sinonjs/commons": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-			"requires": {
+		"node_modules/@sinonjs/commons": {
+			"version": "1.8.6",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+			"integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
 				"type-detect": "4.0.8"
 			}
 		},
-		"@sinonjs/fake-timers": {
+		"node_modules/@sinonjs/commons/node_modules/type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@sinonjs/fake-timers": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
 			"integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
-			"requires": {
+			"license": "BSD-3-Clause",
+			"dependencies": {
 				"@sinonjs/commons": "^1.7.0"
 			}
 		},
-		"@sinonjs/samsam": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz",
-			"integrity": "sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==",
-			"requires": {
+		"node_modules/@sinonjs/samsam": {
+			"version": "6.1.3",
+			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.3.tgz",
+			"integrity": "sha512-nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
 				"@sinonjs/commons": "^1.6.0",
 				"lodash.get": "^4.4.2",
 				"type-detect": "^4.0.8"
 			}
 		},
-		"@sinonjs/text-encoding": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
-			"integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ=="
+		"node_modules/@sinonjs/text-encoding": {
+			"version": "0.7.3",
+			"resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
+			"integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
+			"license": "(Unlicense OR Apache-2.0)"
 		},
-		"@soda/friendly-errors-webpack-plugin": {
+		"node_modules/@soda/friendly-errors-webpack-plugin": {
 			"version": "1.8.1",
 			"resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
 			"integrity": "sha512-h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"chalk": "^3.0.0",
 				"error-stack-parser": "^2.0.6",
 				"string-width": "^4.2.3",
 				"strip-ansi": "^6.0.1"
 			},
+			"engines": {
+				"node": ">=8.0.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"@soda/get-current-script": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz",
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/chalk": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+			"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@soda/friendly-errors-webpack-plugin/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@soda/get-current-script": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz",
 			"integrity": "sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
-		"@sphinxxxx/color-conversion": {
+		"node_modules/@sphinxxxx/color-conversion": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz",
-			"integrity": "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw=="
+			"integrity": "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw==",
+			"license": "ISC"
 		},
-		"@swc/helpers": {
+		"node_modules/@swc/helpers": {
 			"version": "0.3.17",
 			"resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.3.17.tgz",
 			"integrity": "sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q==",
-			"requires": {
-				"tslib": "^2.4.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"tslib": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-					"integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-				}
+				"tslib": "^2.4.0"
 			}
 		},
-		"@types/connect": {
-			"version": "3.4.35",
-			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+		"node_modules/@swc/helpers/node_modules/tslib": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+			"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+			"license": "0BSD"
+		},
+		"node_modules/@types/connect": {
+			"version": "3.4.38",
+			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+			"integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@types/node": "*"
 			}
 		},
-		"@types/cookie": {
+		"node_modules/@types/cookie": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
 			"integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
-		"@types/glob": {
+		"node_modules/@types/glob": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
 			"integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@types/minimatch": "*",
 				"@types/node": "*"
 			}
 		},
-		"@types/http-proxy": {
-			"version": "1.17.9",
-			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-			"integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+		"node_modules/@types/http-proxy": {
+			"version": "1.17.15",
+			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+			"integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@types/node": "*"
 			}
 		},
-		"@types/http-proxy-middleware": {
+		"node_modules/@types/http-proxy-middleware": {
 			"version": "0.19.3",
 			"resolved": "https://registry.npmjs.org/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.3.tgz",
 			"integrity": "sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@types/connect": "*",
 				"@types/http-proxy": "*",
 				"@types/node": "*"
 			}
 		},
-		"@types/inquirer": {
+		"node_modules/@types/inquirer": {
 			"version": "7.3.3",
 			"resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
 			"integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@types/through": "*",
 				"rxjs": "^6.4.0"
-			},
-			"dependencies": {
-				"rxjs": {
-					"version": "6.6.7",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-					"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				}
 			}
 		},
-		"@types/json-schema": {
-			"version": "7.0.11",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-			"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
+		"node_modules/@types/json-schema": {
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+			"license": "MIT"
 		},
-		"@types/minimatch": {
+		"node_modules/@types/minimatch": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
 			"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
-		"@types/node": {
-			"version": "18.11.0",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.0.tgz",
-			"integrity": "sha512-IOXCvVRToe7e0ny7HpT/X9Rb2RYtElG1a+VshjwT00HxrM2dWBApHQoqsI6WiY7Q03vdf2bCrIGzVrkF/5t10w==",
-			"dev": true
+		"node_modules/@types/node": {
+			"version": "22.5.5",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
+			"integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.19.2"
+			}
 		},
-		"@types/normalize-package-data": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-			"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-			"dev": true
+		"node_modules/@types/normalize-package-data": {
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+			"integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"@types/q": {
-			"version": "1.5.5",
-			"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
-			"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
-			"dev": true
+		"node_modules/@types/q": {
+			"version": "1.5.8",
+			"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz",
+			"integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"@types/raf": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz",
-			"integrity": "sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw=="
+		"node_modules/@types/raf": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.3.tgz",
+			"integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==",
+			"license": "MIT"
 		},
-		"@types/regression": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@types/regression/-/regression-2.0.2.tgz",
-			"integrity": "sha512-i7KOGl6xdkfpq5+p2ooC+/XFIRUMkYymZ29SD8p+Ko9lesKGUsh6860ey3YM7Y+ZG7kEDGcjzyLO3sOhozqEeA=="
+		"node_modules/@types/regression": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/regression/-/regression-2.0.6.tgz",
+			"integrity": "sha512-sa+sHOUxh9fywFuAFLCcyupFN0CKX654QUZGW5fAZCmV51I4e5nQy1xL2g/JMUW/PeDoF3Yq2lDXb7MoC3KDNg==",
+			"license": "MIT"
 		},
-		"@types/sizzle": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
-			"integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
-			"dev": true
+		"node_modules/@types/sinonjs__fake-timers": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
+			"integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@types/sizzle": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+			"integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@types/through": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz",
+			"integrity": "sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*"
+			}
 		},
-		"@types/through": {
-			"version": "0.0.30",
-			"resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
-			"integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
+		"node_modules/@types/yauzl": {
+			"version": "2.10.3",
+			"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+			"integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
 				"@types/node": "*"
 			}
 		},
-		"@vue/babel-helper-vue-jsx-merge-props": {
+		"node_modules/@vue/babel-helper-vue-jsx-merge-props": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
 			"integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
-		"@vue/babel-plugin-transform-vue-jsx": {
+		"node_modules/@vue/babel-plugin-transform-vue-jsx": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
 			"integrity": "sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-module-imports": "^7.0.0",
 				"@babel/plugin-syntax-jsx": "^7.2.0",
 				"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
 				"html-tags": "^2.0.0",
 				"lodash.kebabcase": "^4.1.1",
 				"svg-tags": "^1.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@vue/babel-preset-app": {
+		"node_modules/@vue/babel-preset-app": {
 			"version": "3.12.1",
 			"resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-3.12.1.tgz",
 			"integrity": "sha512-Zjy5jQaikV1Pz+ri0YgXFS7q4/5wCxB5tRkDOEIt5+4105u0Feb/pvH20nVL6nx9GyXrECFfcm7Yxr/z++OaPQ==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/helper-module-imports": "^7.0.0",
 				"@babel/plugin-proposal-class-properties": "^7.0.0",
 				"@babel/plugin-proposal-decorators": "^7.1.0",
@@ -1589,12 +2322,13 @@
 				"core-js": "^2.6.5"
 			}
 		},
-		"@vue/babel-preset-jsx": {
+		"node_modules/@vue/babel-preset-jsx": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
 			"integrity": "sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
 				"@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
 				"@vue/babel-sugar-composition-api-inject-h": "^1.4.0",
@@ -1603,81 +2337,116 @@
 				"@vue/babel-sugar-inject-h": "^1.4.0",
 				"@vue/babel-sugar-v-model": "^1.4.0",
 				"@vue/babel-sugar-v-on": "^1.4.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0",
+				"vue": "*"
+			},
+			"peerDependenciesMeta": {
+				"vue": {
+					"optional": true
+				}
 			}
 		},
-		"@vue/babel-sugar-composition-api-inject-h": {
+		"node_modules/@vue/babel-sugar-composition-api-inject-h": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
 			"integrity": "sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/plugin-syntax-jsx": "^7.2.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@vue/babel-sugar-composition-api-render-instance": {
+		"node_modules/@vue/babel-sugar-composition-api-render-instance": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
 			"integrity": "sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/plugin-syntax-jsx": "^7.2.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@vue/babel-sugar-functional-vue": {
+		"node_modules/@vue/babel-sugar-functional-vue": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
 			"integrity": "sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/plugin-syntax-jsx": "^7.2.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@vue/babel-sugar-inject-h": {
+		"node_modules/@vue/babel-sugar-inject-h": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
 			"integrity": "sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/plugin-syntax-jsx": "^7.2.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@vue/babel-sugar-v-model": {
+		"node_modules/@vue/babel-sugar-v-model": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
 			"integrity": "sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/plugin-syntax-jsx": "^7.2.0",
 				"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
 				"@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
 				"camelcase": "^5.0.0",
 				"html-tags": "^2.0.0",
 				"svg-tags": "^1.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@vue/babel-sugar-v-on": {
+		"node_modules/@vue/babel-sugar-v-on": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
 			"integrity": "sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/plugin-syntax-jsx": "^7.2.0",
 				"@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
 				"camelcase": "^5.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@vue/cli-overlay": {
+		"node_modules/@vue/cli-overlay": {
 			"version": "4.5.19",
 			"resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.19.tgz",
 			"integrity": "sha512-GdxvNSmOw7NHIazCO8gTK+xZbaOmScTtxj6eHVeMbYpDYVPJ+th3VMLWNpw/b6uOjwzzcyKlA5dRQ1DAb+gF/g==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
-		"@vue/cli-plugin-babel": {
+		"node_modules/@vue/cli-plugin-babel": {
 			"version": "3.11.0",
 			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-3.11.0.tgz",
 			"integrity": "sha512-RSq9goefilvUMYxbeQS8cZxt6zZnvBIb1xK4NWX0NBtqKzJmIjtJzDAQvKgjnZ/USRu6p6X2IRj4Wum8UCUqow==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@babel/core": "^7.0.0",
 				"@vue/babel-preset-app": "^3.11.0",
 				"@vue/cli-shared-utils": "^3.11.0",
@@ -1685,16597 +2454,22070 @@
 				"webpack": "^4.0.0"
 			}
 		},
-		"@vue/cli-plugin-e2e-cypress": {
+		"node_modules/@vue/cli-plugin-e2e-cypress": {
 			"version": "3.11.0",
 			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-3.11.0.tgz",
 			"integrity": "sha512-k7oT2/sxCSC/ZuHTSbp5VeBu5YnAfmiplS96aoF5JatAi8oP+x58qLc+pBFT1DP1IqacP1U/685v0pJQjo5Ztg==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"@vue/cli-shared-utils": "^3.11.0",
 				"cypress": "^3.2.0",
 				"eslint-plugin-cypress": "^2.2.1"
-			},
+			}
+		},
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/@types/sizzle": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
+			"integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/arch": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
+			"integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/async": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+			"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"bluebird": {
-					"version": "3.5.0",
-					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-					"integrity": "sha512-3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ==",
-					"dev": true
-				},
-				"commander": {
-					"version": "2.15.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-					"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-					"dev": true
-				},
-				"cypress": {
-					"version": "3.8.3",
-					"resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.3.tgz",
-					"integrity": "sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==",
-					"dev": true,
-					"requires": {
-						"@cypress/listr-verbose-renderer": "0.4.1",
-						"@cypress/xvfb": "1.2.4",
-						"@types/sizzle": "2.3.2",
-						"arch": "2.1.1",
-						"bluebird": "3.5.0",
-						"cachedir": "1.3.0",
-						"chalk": "2.4.2",
-						"check-more-types": "2.24.0",
-						"commander": "2.15.1",
-						"common-tags": "1.8.0",
-						"debug": "3.2.6",
-						"eventemitter2": "4.1.2",
-						"execa": "0.10.0",
-						"executable": "4.1.1",
-						"extract-zip": "1.6.7",
-						"fs-extra": "5.0.0",
-						"getos": "3.1.1",
-						"is-ci": "1.2.1",
-						"is-installed-globally": "0.1.0",
-						"lazy-ass": "1.6.0",
-						"listr": "0.12.0",
-						"lodash": "4.17.15",
-						"log-symbols": "2.2.0",
-						"minimist": "1.2.0",
-						"moment": "2.24.0",
-						"ramda": "0.24.1",
-						"request": "2.88.0",
-						"request-progress": "3.0.0",
-						"supports-color": "5.5.0",
-						"tmp": "0.1.0",
-						"untildify": "3.0.3",
-						"url": "0.11.0",
-						"yauzl": "2.10.0"
-					}
-				},
-				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.15",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-					"dev": true
-				},
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==",
-					"dev": true
-				},
-				"moment": {
-					"version": "2.24.0",
-					"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-					"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
-					"dev": true
-				},
-				"punycode": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-					"dev": true
-				},
-				"request": {
-					"version": "2.88.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-					"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "~0.7.0",
-						"aws4": "^1.8.0",
-						"caseless": "~0.12.0",
-						"combined-stream": "~1.0.6",
-						"extend": "~3.0.2",
-						"forever-agent": "~0.6.1",
-						"form-data": "~2.3.2",
-						"har-validator": "~5.1.0",
-						"http-signature": "~1.2.0",
-						"is-typedarray": "~1.0.0",
-						"isstream": "~0.1.2",
-						"json-stringify-safe": "~5.0.1",
-						"mime-types": "~2.1.19",
-						"oauth-sign": "~0.9.0",
-						"performance-now": "^2.1.0",
-						"qs": "~6.5.2",
-						"safe-buffer": "^5.1.2",
-						"tough-cookie": "~2.4.3",
-						"tunnel-agent": "^0.6.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"tough-cookie": {
-					"version": "2.4.3",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-					"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.24",
-						"punycode": "^1.4.1"
-					}
-				}
+				"lodash": "^4.17.10"
 			}
 		},
-		"@vue/cli-plugin-eslint": {
-			"version": "3.11.0",
-			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.11.0.tgz",
-			"integrity": "sha512-cZWTXFbMu7/Ha6uAyvFsOxjC82afmHk0M9ye2MyeXmkvdL+tB2rcIITbd9HZypPaky1qv46Mp5l/lSd9W4PVCA==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/bluebird": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+			"integrity": "sha512-3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ==",
 			"dev": true,
-			"requires": {
-				"@vue/cli-shared-utils": "^3.11.0",
-				"babel-eslint": "^10.0.1",
-				"eslint": "^4.19.1",
-				"eslint-loader": "^2.1.2",
-				"eslint-plugin-vue": "^4.7.1",
-				"globby": "^9.2.0",
-				"webpack": "^4.0.0",
-				"yorkie": "^2.0.0"
-			},
+			"license": "MIT"
+		},
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/cachedir": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-1.3.0.tgz",
+			"integrity": "sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true,
-					"optional": true
-				},
-				"cross-spawn": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-					"integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"lru-cache": "^4.0.1",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"eslint": {
-					"version": "4.19.1",
-					"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-					"integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ajv": "^5.3.0",
-						"babel-code-frame": "^6.22.0",
-						"chalk": "^2.1.0",
-						"concat-stream": "^1.6.0",
-						"cross-spawn": "^5.1.0",
-						"debug": "^3.1.0",
-						"doctrine": "^2.1.0",
-						"eslint-scope": "^3.7.1",
-						"eslint-visitor-keys": "^1.0.0",
-						"espree": "^3.5.4",
-						"esquery": "^1.0.0",
-						"esutils": "^2.0.2",
-						"file-entry-cache": "^2.0.0",
-						"functional-red-black-tree": "^1.0.1",
-						"glob": "^7.1.2",
-						"globals": "^11.0.1",
-						"ignore": "^3.3.3",
-						"imurmurhash": "^0.1.4",
-						"inquirer": "^3.0.6",
-						"is-resolvable": "^1.0.0",
-						"js-yaml": "^3.9.1",
-						"json-stable-stringify-without-jsonify": "^1.0.1",
-						"levn": "^0.3.0",
-						"lodash": "^4.17.4",
-						"minimatch": "^3.0.2",
-						"mkdirp": "^0.5.1",
-						"natural-compare": "^1.4.0",
-						"optionator": "^0.8.2",
-						"path-is-inside": "^1.0.2",
-						"pluralize": "^7.0.0",
-						"progress": "^2.0.0",
-						"regexpp": "^1.0.1",
-						"require-uncached": "^1.0.3",
-						"semver": "^5.3.0",
-						"strip-ansi": "^4.0.0",
-						"strip-json-comments": "~2.0.1",
-						"table": "4.0.2",
-						"text-table": "~0.2.0"
-					}
-				},
-				"eslint-plugin-vue": {
-					"version": "4.7.1",
-					"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz",
-					"integrity": "sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"vue-eslint-parser": "^2.0.3"
-					}
-				},
-				"eslint-scope": {
-					"version": "3.7.3",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
-					"integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"esrecurse": "^4.1.0",
-						"estraverse": "^4.1.1"
-					}
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
-					"dev": true,
-					"optional": true
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
-					"dev": true,
-					"optional": true
-				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true,
-					"optional": true
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
+				"os-homedir": "^1.0.1"
 			}
 		},
-		"@vue/cli-plugin-router": {
-			"version": "4.5.19",
-			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.19.tgz",
-			"integrity": "sha512-3icGzH1IbVYmMMsOwYa0lal/gtvZLebFXdE5hcQJo2mnTwngXGMTyYAzL56EgHBPjbMmRpyj6Iw9k4aVInVX6A==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/ci-info": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+			"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
 			"dev": true,
-			"requires": {
-				"@vue/cli-shared-utils": "^4.5.19"
-			},
+			"license": "MIT"
+		},
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/commander": {
+			"version": "2.15.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+			"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/common-tags": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
+			"integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/cypress": {
+			"version": "3.8.3",
+			"resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.3.tgz",
+			"integrity": "sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
 			"dependencies": {
-				"@vue/cli-shared-utils": {
-					"version": "4.5.19",
-					"resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.19.tgz",
-					"integrity": "sha512-JYpdsrC/d9elerKxbEUtmSSU6QRM60rirVubOewECHkBHj+tLNznWq/EhCjswywtePyLaMUK25eTqnTSZlEE+g==",
-					"dev": true,
-					"requires": {
-						"@achrinza/node-ipc": "9.2.2",
-						"@hapi/joi": "^15.0.1",
-						"chalk": "^2.4.2",
-						"execa": "^1.0.0",
-						"launch-editor": "^2.2.1",
-						"lru-cache": "^5.1.1",
-						"open": "^6.3.0",
-						"ora": "^3.4.0",
-						"read-pkg": "^5.1.1",
-						"request": "^2.88.2",
-						"semver": "^6.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				},
-				"yallist": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-					"dev": true
-				}
+				"@cypress/listr-verbose-renderer": "0.4.1",
+				"@cypress/xvfb": "1.2.4",
+				"@types/sizzle": "2.3.2",
+				"arch": "2.1.1",
+				"bluebird": "3.5.0",
+				"cachedir": "1.3.0",
+				"chalk": "2.4.2",
+				"check-more-types": "2.24.0",
+				"commander": "2.15.1",
+				"common-tags": "1.8.0",
+				"debug": "3.2.6",
+				"eventemitter2": "4.1.2",
+				"execa": "0.10.0",
+				"executable": "4.1.1",
+				"extract-zip": "1.6.7",
+				"fs-extra": "5.0.0",
+				"getos": "3.1.1",
+				"is-ci": "1.2.1",
+				"is-installed-globally": "0.1.0",
+				"lazy-ass": "1.6.0",
+				"listr": "0.12.0",
+				"lodash": "4.17.15",
+				"log-symbols": "2.2.0",
+				"minimist": "1.2.0",
+				"moment": "2.24.0",
+				"ramda": "0.24.1",
+				"request": "2.88.0",
+				"request-progress": "3.0.0",
+				"supports-color": "5.5.0",
+				"tmp": "0.1.0",
+				"untildify": "3.0.3",
+				"url": "0.11.0",
+				"yauzl": "2.10.0"
+			},
+			"bin": {
+				"cypress": "bin/cypress"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"@vue/cli-plugin-unit-mocha": {
-			"version": "3.11.0",
-			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-unit-mocha/-/cli-plugin-unit-mocha-3.11.0.tgz",
-			"integrity": "sha512-VLk6Z4OEWYQ9iSB1A1Pc5wWijOFXYzBs1AvtZernMu9m1M/hzitf1YALSUJrV853CA5u1yaBK4NpyGYm36rKgg==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/debug": {
+			"version": "3.2.6",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+			"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+			"deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
 			"dev": true,
-			"requires": {
-				"@vue/cli-shared-utils": "^3.11.0",
-				"jsdom": "^13.2.0",
-				"jsdom-global": "^3.0.2",
-				"mocha": "^5.2.0",
-				"mocha-webpack": "^2.0.0-beta.0"
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.1"
 			}
 		},
-		"@vue/cli-plugin-vuex": {
-			"version": "4.5.19",
-			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.19.tgz",
-			"integrity": "sha512-DUmfdkG3pCdkP7Iznd87RfE9Qm42mgp2hcrNcYQYSru1W1gX2dG/JcW8bxmeGSa06lsxi9LEIc/QD1yPajSCZw==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/eventemitter2": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-4.1.2.tgz",
+			"integrity": "sha512-erx0niBaTi8B7ywjGAcg8ilGNRl/xs/o4MO2ZMpRlpZ62mYzjGTBlOpxxRIrPQqBs9mbXkEux6aR+Sc5vQ/wUw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"@vue/cli-service": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.3.1.tgz",
-			"integrity": "sha512-CsNGfHe+9oKZdRwJmweQ0KsMYM27ssg1eNQqRKL/t+IgDLO3Tu86uaOOCLn4ZAaU5oxxpq4aSFvz+A0YxQRSWw==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/execa": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+			"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
 			"dev": true,
-			"requires": {
-				"@intervolga/optimize-cssnano-plugin": "^1.0.5",
-				"@soda/friendly-errors-webpack-plugin": "^1.7.1",
-				"@soda/get-current-script": "^1.0.0",
-				"@vue/cli-overlay": "^4.3.1",
-				"@vue/cli-plugin-router": "^4.3.1",
-				"@vue/cli-plugin-vuex": "^4.3.1",
-				"@vue/cli-shared-utils": "^4.3.1",
-				"@vue/component-compiler-utils": "^3.0.2",
-				"@vue/preload-webpack-plugin": "^1.1.0",
-				"@vue/web-component-wrapper": "^1.2.0",
-				"acorn": "^7.1.0",
-				"acorn-walk": "^7.1.1",
-				"address": "^1.1.2",
-				"autoprefixer": "^9.7.5",
-				"browserslist": "^4.11.1",
-				"cache-loader": "^4.1.0",
-				"case-sensitive-paths-webpack-plugin": "^2.3.0",
-				"cli-highlight": "^2.1.4",
-				"clipboardy": "^2.3.0",
-				"cliui": "^6.0.0",
-				"copy-webpack-plugin": "^5.1.1",
-				"css-loader": "^3.4.2",
-				"cssnano": "^4.1.10",
-				"debug": "^4.1.1",
-				"default-gateway": "^5.0.5",
-				"dotenv": "^8.2.0",
-				"dotenv-expand": "^5.1.0",
-				"file-loader": "^4.2.0",
-				"fs-extra": "^7.0.1",
-				"globby": "^9.2.0",
-				"hash-sum": "^2.0.0",
-				"html-webpack-plugin": "^3.2.0",
-				"launch-editor-middleware": "^2.2.1",
-				"lodash.defaultsdeep": "^4.6.1",
-				"lodash.mapvalues": "^4.6.0",
-				"lodash.transform": "^4.6.0",
-				"mini-css-extract-plugin": "^0.9.0",
-				"minimist": "^1.2.5",
-				"pnp-webpack-plugin": "^1.6.4",
-				"portfinder": "^1.0.25",
-				"postcss-loader": "^3.0.0",
-				"ssri": "^7.1.0",
-				"terser-webpack-plugin": "^2.3.5",
-				"thread-loader": "^2.1.3",
-				"url-loader": "^2.2.0",
-				"vue-loader": "^15.9.1",
-				"vue-style-loader": "^4.1.2",
-				"webpack": "^4.0.0",
-				"webpack-bundle-analyzer": "^3.6.1",
-				"webpack-chain": "^6.4.0",
-				"webpack-dev-server": "^3.10.3",
-				"webpack-merge": "^4.2.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"@vue/cli-shared-utils": {
-					"version": "4.5.19",
-					"resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.19.tgz",
-					"integrity": "sha512-JYpdsrC/d9elerKxbEUtmSSU6QRM60rirVubOewECHkBHj+tLNznWq/EhCjswywtePyLaMUK25eTqnTSZlEE+g==",
-					"dev": true,
-					"requires": {
-						"@achrinza/node-ipc": "9.2.2",
-						"@hapi/joi": "^15.0.1",
-						"chalk": "^2.4.2",
-						"execa": "^1.0.0",
-						"launch-editor": "^2.2.1",
-						"lru-cache": "^5.1.1",
-						"open": "^6.3.0",
-						"ora": "^3.4.0",
-						"read-pkg": "^5.1.1",
-						"request": "^2.88.2",
-						"semver": "^6.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"acorn": {
-					"version": "7.4.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-					"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-					"dev": true
-				},
-				"acorn-walk": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-					"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"cacache": {
-					"version": "13.0.1",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
-					"integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.2",
-						"figgy-pudding": "^3.5.1",
-						"fs-minipass": "^2.0.0",
-						"glob": "^7.1.4",
-						"graceful-fs": "^4.2.2",
-						"infer-owner": "^1.0.4",
-						"lru-cache": "^5.1.1",
-						"minipass": "^3.0.0",
-						"minipass-collect": "^1.0.2",
-						"minipass-flush": "^1.0.5",
-						"minipass-pipeline": "^1.2.2",
-						"mkdirp": "^0.5.1",
-						"move-concurrently": "^1.0.1",
-						"p-map": "^3.0.0",
-						"promise-inflight": "^1.0.1",
-						"rimraf": "^2.7.1",
-						"ssri": "^7.0.0",
-						"unique-filename": "^1.1.1"
-					}
-				},
-				"cliui": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-					"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
-						"wrap-ansi": "^6.2.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"css-loader": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
-					"integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.3.1",
-						"cssesc": "^3.0.0",
-						"icss-utils": "^4.1.1",
-						"loader-utils": "^1.2.3",
-						"normalize-path": "^3.0.0",
-						"postcss": "^7.0.32",
-						"postcss-modules-extract-imports": "^2.0.0",
-						"postcss-modules-local-by-default": "^3.0.2",
-						"postcss-modules-scope": "^2.2.0",
-						"postcss-modules-values": "^3.0.0",
-						"postcss-value-parser": "^4.1.0",
-						"schema-utils": "^2.7.0",
-						"semver": "^6.3.0"
-					}
-				},
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"fs-extra": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-					"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"hash-sum": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-					"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-map": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-					"integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-					"dev": true,
-					"requires": {
-						"aggregate-error": "^3.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"ssri": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.1.tgz",
-					"integrity": "sha512-w+daCzXN89PseTL99MkA+fxJEcU3wfaE/ah0i0lnOlpG1CYLJ2ZjzEry68YBKfLs4JfoTShrTEsJkAZuNZ/stw==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"minipass": "^3.1.1"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				},
-				"terser-webpack-plugin": {
-					"version": "2.3.8",
-					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
-					"integrity": "sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==",
-					"dev": true,
-					"requires": {
-						"cacache": "^13.0.1",
-						"find-cache-dir": "^3.3.1",
-						"jest-worker": "^25.4.0",
-						"p-limit": "^2.3.0",
-						"schema-utils": "^2.6.6",
-						"serialize-javascript": "^4.0.0",
-						"source-map": "^0.6.1",
-						"terser": "^4.6.12",
-						"webpack-sources": "^1.4.3"
-					}
-				},
-				"vue-loader": {
-					"version": "15.10.0",
-					"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz",
-					"integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
-					"dev": true,
-					"requires": {
-						"@vue/component-compiler-utils": "^3.1.0",
-						"hash-sum": "^1.0.2",
-						"loader-utils": "^1.1.0",
-						"vue-hot-reload-api": "^2.3.0",
-						"vue-style-loader": "^4.1.0"
-					},
-					"dependencies": {
-						"hash-sum": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-							"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-							"dev": true
-						}
-					}
-				},
-				"wrap-ansi": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-					"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-					"dev": true
-				}
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@vue/cli-shared-utils": {
-			"version": "3.12.1",
-			"resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.12.1.tgz",
-			"integrity": "sha512-jFblzRFjutGwu5utOKdVlPlsbA1lBUNNQlAThzNqej+JtTKJjnvjlhjKX0Gq0oOny5FjKWhoyfQ74p9h1qE6JQ==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/extract-zip": {
+			"version": "1.6.7",
+			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
+			"integrity": "sha512-NWFb/0zxv3qh7f6hEy+F+Y+jPAqt1bfT52GR8Vi7sEFg2fBZlG/aM6ZrSGPUscP0I4JRhtgVG6I17HOuD7GESw==",
 			"dev": true,
-			"requires": {
-				"@hapi/joi": "^15.0.1",
-				"chalk": "^2.4.1",
-				"execa": "^1.0.0",
-				"launch-editor": "^2.2.1",
-				"lru-cache": "^5.1.1",
-				"node-ipc": "^9.1.1",
-				"open": "^6.3.0",
-				"ora": "^3.4.0",
-				"request": "^2.87.0",
-				"request-promise-native": "^1.0.7",
-				"semver": "^6.0.0",
-				"string.prototype.padstart": "^3.0.0"
-			},
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"yallist": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-					"dev": true
-				}
-			}
-		},
-		"@vue/compiler-sfc": {
-			"version": "2.7.13",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz",
-			"integrity": "sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==",
-			"requires": {
-				"@babel/parser": "^7.18.4",
-				"postcss": "^8.4.14",
-				"source-map": "^0.6.1"
+				"concat-stream": "1.6.2",
+				"debug": "2.6.9",
+				"mkdirp": "0.5.1",
+				"yauzl": "2.4.1"
+			},
+			"bin": {
+				"extract-zip": "cli.js"
 			}
 		},
-		"@vue/component-compiler-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
-			"integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
-			"requires": {
-				"consolidate": "^0.15.1",
-				"hash-sum": "^1.0.2",
-				"lru-cache": "^4.1.2",
-				"merge-source-map": "^1.1.0",
-				"postcss": "^7.0.36",
-				"postcss-selector-parser": "^6.0.2",
-				"prettier": "^1.18.2 || ^2.0.0",
-				"source-map": "~0.6.1",
-				"vue-template-es2015-compiler": "^1.9.0"
-			},
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/extract-zip/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"prettier": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-					"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-					"optional": true
-				}
+				"ms": "2.0.0"
 			}
 		},
-		"@vue/preload-webpack-plugin": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz",
-			"integrity": "sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/extract-zip/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"@vue/test-utils": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.1.4.tgz",
-			"integrity": "sha512-9BeL8IqGvJKy553lq/07rhYURQkpS/k+j19rJ/4eDpGJk7z872M0YrBWFhjS14yMKlvYVYOCfWnVIXyrAx0xNw==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/extract-zip/node_modules/yauzl": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+			"integrity": "sha512-TXNR2Feu/p/8k5YRy4z45wCUhoncIrZywmRd+xW0IvB3lWTAM7F6wVbeJvRjO0dplQ8oqmJEj/TpJuULBV/hbw==",
 			"dev": true,
-			"requires": {
-				"dom-event-types": "^1.0.0",
-				"lodash": "^4.17.15",
-				"pretty": "^2.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"fd-slicer": "~1.0.1"
 			}
 		},
-		"@vue/web-component-wrapper": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
-			"integrity": "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==",
-			"dev": true
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-			"integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/fd-slicer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+			"integrity": "sha512-MX1ZLPIuKED51hrI4++K+1B0VX87Cs4EkybD2q12Ysuf5p4vkmHqMvQJRlDwROqFr4D2Pzyit5wGQxf30grIcw==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/helper-module-context": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/wast-parser": "1.9.0"
+			"license": "MIT",
+			"dependencies": {
+				"pend": "~1.2.0"
 			}
 		},
-		"@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-			"integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-api-error": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-			"integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-buffer": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-			"integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-code-frame": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-			"integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/form-data": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/wast-printer": "1.9.0"
+			"license": "MIT",
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.6",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 0.12"
 			}
 		},
-		"@webassemblyjs/helper-fsm": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-			"integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-module-context": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-			"integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/fs-extra": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+			"integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0"
+			"license": "MIT",
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"jsonfile": "^4.0.0",
+				"universalify": "^0.1.0"
 			}
 		},
-		"@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-			"integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"@webassemblyjs/helper-wasm-section": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-			"integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/getos": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/getos/-/getos-3.1.1.tgz",
+			"integrity": "sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-buffer": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/wasm-gen": "1.9.0"
+			"license": "MIT",
+			"dependencies": {
+				"async": "2.6.1"
 			}
 		},
-		"@webassemblyjs/ieee754": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-			"integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/global-dirs": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+			"integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==",
 			"dev": true,
-			"requires": {
-				"@xtuc/ieee754": "^1.2.0"
+			"license": "MIT",
+			"dependencies": {
+				"ini": "^1.3.4"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@webassemblyjs/leb128": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-			"integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
 			"dev": true,
-			"requires": {
-				"@xtuc/long": "4.2.2"
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			},
+			"engines": {
+				"node": ">=0.8",
+				"npm": ">=1.3.7"
 			}
 		},
-		"@webassemblyjs/utf8": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-			"integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true,
+			"license": "ISC"
 		},
-		"@webassemblyjs/wasm-edit": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-			"integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/is-ci": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+			"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-buffer": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/helper-wasm-section": "1.9.0",
-				"@webassemblyjs/wasm-gen": "1.9.0",
-				"@webassemblyjs/wasm-opt": "1.9.0",
-				"@webassemblyjs/wasm-parser": "1.9.0",
-				"@webassemblyjs/wast-printer": "1.9.0"
+			"license": "MIT",
+			"dependencies": {
+				"ci-info": "^1.5.0"
+			},
+			"bin": {
+				"is-ci": "bin.js"
 			}
 		},
-		"@webassemblyjs/wasm-gen": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-			"integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/is-installed-globally": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
+			"integrity": "sha512-ERNhMg+i/XgDwPIPF3u24qpajVreaiSuvpb1Uu0jugw7KKcxGyCX8cgp8P5fwTmAuXku6beDHHECdKArjlg7tw==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/ieee754": "1.9.0",
-				"@webassemblyjs/leb128": "1.9.0",
-				"@webassemblyjs/utf8": "1.9.0"
+			"license": "MIT",
+			"dependencies": {
+				"global-dirs": "^0.1.0",
+				"is-path-inside": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@webassemblyjs/wasm-opt": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-			"integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/is-path-inside": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+			"integrity": "sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-buffer": "1.9.0",
-				"@webassemblyjs/wasm-gen": "1.9.0",
-				"@webassemblyjs/wasm-parser": "1.9.0"
+			"license": "MIT",
+			"dependencies": {
+				"path-is-inside": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"@webassemblyjs/wasm-parser": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-			"integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/jsprim": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+			"integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-api-error": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/ieee754": "1.9.0",
-				"@webassemblyjs/leb128": "1.9.0",
-				"@webassemblyjs/utf8": "1.9.0"
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.4.0",
+				"verror": "1.10.0"
+			},
+			"engines": {
+				"node": ">=0.6.0"
 			}
 		},
-		"@webassemblyjs/wast-parser": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-			"integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/lodash": {
+			"version": "4.17.15",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+			"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/floating-point-hex-parser": "1.9.0",
-				"@webassemblyjs/helper-api-error": "1.9.0",
-				"@webassemblyjs/helper-code-frame": "1.9.0",
-				"@webassemblyjs/helper-fsm": "1.9.0",
-				"@xtuc/long": "4.2.2"
-			}
+			"license": "MIT"
 		},
-		"@webassemblyjs/wast-printer": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-			"integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/log-symbols": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+			"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
 			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/wast-parser": "1.9.0",
-				"@xtuc/long": "4.2.2"
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@xtuc/ieee754": {
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/minimist": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"dev": true
-		},
-		"@xtuc/long": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+			"integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"abab": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/mkdirp": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+			"integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
+			"deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "0.0.8"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			}
 		},
-		"abbrev": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/mkdirp/node_modules/minimist": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+			"integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"accepts": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/moment": {
+			"version": "2.24.0",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+			"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
 			"dev": true,
-			"requires": {
-				"mime-types": "~2.1.34",
-				"negotiator": "0.6.3"
+			"license": "MIT",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"acorn": {
-			"version": "6.4.2",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/punycode": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"acorn-globals": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
-			"integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/qs": {
+			"version": "6.5.3",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+			"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
 			"dev": true,
-			"requires": {
-				"acorn": "^6.0.1",
-				"acorn-walk": "^6.0.1"
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.6"
 			}
 		},
-		"acorn-jsx": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-			"integrity": "sha512-AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/request": {
+			"version": "2.88.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+			"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"acorn": "^3.0.4"
-			},
+			"license": "Apache-2.0",
 			"dependencies": {
-				"acorn": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-					"integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==",
-					"dev": true,
-					"optional": true
-				}
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~2.3.2",
+				"har-validator": "~5.1.0",
+				"http-signature": "~1.2.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"oauth-sign": "~0.9.0",
+				"performance-now": "^2.1.0",
+				"qs": "~6.5.2",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "~2.4.3",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^3.3.2"
+			},
+			"engines": {
+				"node": ">= 4"
 			}
 		},
-		"acorn-walk": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-			"integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
-			"dev": true
-		},
-		"address": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/address/-/address-1.2.1.tgz",
-			"integrity": "sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==",
-			"dev": true
-		},
-		"adler-32": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
-			"integrity": "sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==",
-			"requires": {
-				"exit-on-epipe": "~1.0.1",
-				"printj": "~1.1.0"
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/tmp": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
+			"integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"rimraf": "^2.6.3"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"aggregate-error": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/tough-cookie": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
 			"dev": true,
-			"requires": {
-				"clean-stack": "^2.0.0",
-				"indent-string": "^4.0.0"
-			},
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"indent-string": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-					"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-					"dev": true
-				}
+				"psl": "^1.1.24",
+				"punycode": "^1.4.1"
+			},
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"ajv": {
-			"version": "6.12.3",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-			"integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/untildify": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"ajv-errors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-			"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-			"dev": true
-		},
-		"ajv-keywords": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
-		},
-		"alphanum-sort": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-			"integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
-			"dev": true
-		},
-		"ansi-colors": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-			"integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-			"dev": true
-		},
-		"ansi-escapes": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-			"integrity": "sha512-wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==",
-			"dev": true
-		},
-		"ansi-html-community": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/url": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+			"integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"punycode": "1.3.2",
+				"querystring": "0.2.0"
+			}
 		},
-		"ansi-regex": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/url/node_modules/punycode": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+			"integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+		"node_modules/@vue/cli-plugin-e2e-cypress/node_modules/uuid": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+			"deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
 			"dev": true,
-			"requires": {
-				"color-convert": "^1.9.0"
+			"license": "MIT",
+			"bin": {
+				"uuid": "bin/uuid"
 			}
 		},
-		"any-observable": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz",
-			"integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-eslint": {
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.11.0.tgz",
+			"integrity": "sha512-cZWTXFbMu7/Ha6uAyvFsOxjC82afmHk0M9ye2MyeXmkvdL+tB2rcIITbd9HZypPaky1qv46Mp5l/lSd9W4PVCA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@vue/cli-shared-utils": "^3.11.0",
+				"babel-eslint": "^10.0.1",
+				"eslint-loader": "^2.1.2",
+				"globby": "^9.2.0",
+				"webpack": "^4.0.0",
+				"yorkie": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"eslint": "^4.19.1",
+				"eslint-plugin-vue": "^4.7.1"
+			}
 		},
-		"any-promise": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-			"integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-eslint/node_modules/acorn": {
+			"version": "5.7.4",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+			"integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
 		},
-		"anymatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/acorn-jsx": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+			"integrity": "sha512-AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ==",
 			"dev": true,
+			"license": "MIT",
 			"optional": true,
-			"requires": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
+			"dependencies": {
+				"acorn": "^3.0.4"
 			}
 		},
-		"aproba": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-			"dev": true
-		},
-		"arch": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-			"integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
-			"dev": true
-		},
-		"are-we-there-yet": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-			"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/acorn-jsx/node_modules/acorn": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+			"integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==",
 			"dev": true,
+			"license": "MIT",
 			"optional": true,
-			"requires": {
-				"delegates": "^1.0.0",
-				"readable-stream": "^2.0.6"
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
 			}
 		},
-		"argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/ajv": {
+			"version": "5.5.2",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+			"integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
 			"dev": true,
-			"requires": {
-				"sprintf-js": "~1.0.2"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"co": "^4.6.0",
+				"fast-deep-equal": "^1.0.0",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.3.0"
 			}
 		},
-		"arr-diff": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-			"integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-			"dev": true
-		},
-		"arr-flatten": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-			"dev": true
-		},
-		"arr-union": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-			"integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-			"dev": true
-		},
-		"array-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-			"integrity": "sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==",
-			"dev": true
-		},
-		"array-flatten": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-			"dev": true
-		},
-		"array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/ajv-keywords": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+			"integrity": "sha512-ZFztHzVRdGLAzJmpUT9LNFLe1YiVOEylcaNpEutM26PVTCtOD919IMfD01CgbRouB42Dd9atjx1HseC15DgOZA==",
 			"dev": true,
-			"requires": {
-				"array-uniq": "^1.0.1"
+			"license": "MIT",
+			"optional": true,
+			"peerDependencies": {
+				"ajv": "^5.0.0"
 			}
 		},
-		"array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-			"dev": true
-		},
-		"array-unique": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-			"integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-			"dev": true
-		},
-		"array.prototype.reduce": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz",
-			"integrity": "sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/ansi-regex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+			"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.2",
-				"es-array-method-boxes-properly": "^1.0.0",
-				"is-string": "^1.0.7"
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"asn1": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-			"integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/chardet": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+			"integrity": "sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==",
 			"dev": true,
-			"requires": {
-				"safer-buffer": "~2.1.0"
-			}
+			"license": "MIT",
+			"optional": true
 		},
-		"asn1.js": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/cli-cursor": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+			"integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
 			"dev": true,
-			"requires": {
-				"bn.js": "^4.0.0",
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"safer-buffer": "^2.1.0"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
+				"restore-cursor": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"assert": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-			"integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/cross-spawn": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+			"integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
 			"dev": true,
-			"requires": {
-				"object-assign": "^4.1.1",
-				"util": "0.10.3"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"inherits": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-					"integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-					"dev": true
-				},
-				"util": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-					"integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
-					"dev": true,
-					"requires": {
-						"inherits": "2.0.1"
-					}
-				}
+				"lru-cache": "^4.0.1",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
 			}
 		},
-		"assert-plus": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-			"dev": true
-		},
-		"assertion-error": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-			"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-			"dev": true
-		},
-		"assign-symbols": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-			"integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-			"dev": true
-		},
-		"astral-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-			"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-			"dev": true
-		},
-		"async": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-			"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
 			"dev": true,
-			"requires": {
-				"lodash": "^4.17.10"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"ms": "^2.1.1"
 			}
 		},
-		"async-each": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-			"dev": true
-		},
-		"async-limiter": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-			"integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-			"dev": true
-		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-			"dev": true
-		},
-		"atob": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-			"dev": true
-		},
-		"autoprefixer": {
-			"version": "9.8.8",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz",
-			"integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/doctrine": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+			"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.12.0",
-				"caniuse-lite": "^1.0.30001109",
-				"normalize-range": "^0.1.2",
-				"num2fraction": "^1.2.2",
-				"picocolors": "^0.2.1",
-				"postcss": "^7.0.32",
-				"postcss-value-parser": "^4.1.0"
-			},
+			"license": "Apache-2.0",
+			"optional": true,
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
-			}
-		},
-		"available-typed-arrays": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
-		},
-		"aws-sign2": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-			"integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-			"dev": true
-		},
-		"aws4": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-			"dev": true
-		},
-		"axios": {
-			"version": "0.21.4",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-			"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-			"requires": {
-				"follow-redirects": "^1.14.0"
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"babel-code-frame": {
-			"version": "6.26.0",
-			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-			"integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/eslint": {
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+			"integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
 			"dev": true,
+			"license": "MIT",
 			"optional": true,
-			"requires": {
-				"chalk": "^1.1.3",
+			"dependencies": {
+				"ajv": "^5.3.0",
+				"babel-code-frame": "^6.22.0",
+				"chalk": "^2.1.0",
+				"concat-stream": "^1.6.0",
+				"cross-spawn": "^5.1.0",
+				"debug": "^3.1.0",
+				"doctrine": "^2.1.0",
+				"eslint-scope": "^3.7.1",
+				"eslint-visitor-keys": "^1.0.0",
+				"espree": "^3.5.4",
+				"esquery": "^1.0.0",
 				"esutils": "^2.0.2",
-				"js-tokens": "^3.0.2"
+				"file-entry-cache": "^2.0.0",
+				"functional-red-black-tree": "^1.0.1",
+				"glob": "^7.1.2",
+				"globals": "^11.0.1",
+				"ignore": "^3.3.3",
+				"imurmurhash": "^0.1.4",
+				"inquirer": "^3.0.6",
+				"is-resolvable": "^1.0.0",
+				"js-yaml": "^3.9.1",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.3.0",
+				"lodash": "^4.17.4",
+				"minimatch": "^3.0.2",
+				"mkdirp": "^0.5.1",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.8.2",
+				"path-is-inside": "^1.0.2",
+				"pluralize": "^7.0.0",
+				"progress": "^2.0.0",
+				"regexpp": "^1.0.1",
+				"require-uncached": "^1.0.3",
+				"semver": "^5.3.0",
+				"strip-ansi": "^4.0.0",
+				"strip-json-comments": "~2.0.1",
+				"table": "4.0.2",
+				"text-table": "~0.2.0"
 			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true,
-					"optional": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-					"dev": true,
-					"optional": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"js-tokens": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-					"integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
-					"dev": true,
-					"optional": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-					"dev": true,
-					"optional": true
-				}
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"babel-eslint": {
-			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
-			"integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/eslint-plugin-vue": {
+			"version": "4.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz",
+			"integrity": "sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==",
 			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/parser": "^7.0.0",
-				"@babel/traverse": "^7.0.0",
-				"@babel/types": "^7.0.0",
-				"eslint-scope": "3.7.1",
-				"eslint-visitor-keys": "^1.0.0"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"eslint-scope": {
-					"version": "3.7.1",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
-					"integrity": "sha512-ivpbtpUgg9SJS4TLjK7KdcDhqc/E3CGItsvQbBNLkNGUeMhd5qnJcryba/brESS+dg3vrLqPuc/UcS7jRJdN5A==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.1.0",
-						"estraverse": "^4.1.1"
-					}
-				}
+				"vue-eslint-parser": "^2.0.3"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependencies": {
+				"eslint": "^3.18.0 || ^4.0.0"
 			}
 		},
-		"babel-loader": {
-			"version": "8.2.5",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-			"integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/espree": {
+			"version": "3.5.4",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+			"integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
 			"dev": true,
-			"requires": {
-				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^2.0.0",
-				"make-dir": "^3.1.0",
-				"schema-utils": "^2.6.5"
-			},
+			"license": "BSD-2-Clause",
+			"optional": true,
 			"dependencies": {
-				"json5": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-					"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-					"dev": true
-				},
-				"loader-utils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-					"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-					"dev": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^2.1.2"
-					}
-				}
+				"acorn": "^5.5.0",
+				"acorn-jsx": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"babel-plugin-dynamic-import-node": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-			"integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/external-editor": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+			"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
 			"dev": true,
-			"requires": {
-				"object.assign": "^4.1.0"
-			}
-		},
-		"babel-plugin-module-resolver": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz",
-			"integrity": "sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==",
-			"dev": true,
-			"requires": {
-				"find-babel-config": "^1.1.0",
-				"glob": "^7.1.2",
-				"pkg-up": "^2.0.0",
-				"reselect": "^3.0.1",
-				"resolve": "^1.4.0"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"chardet": "^0.4.0",
+				"iconv-lite": "^0.4.17",
+				"tmp": "^0.0.33"
+			},
+			"engines": {
+				"node": ">=0.12"
 			}
 		},
-		"babel-plugin-polyfill-corejs2": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-			"integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/fast-deep-equal": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+			"integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
 			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.17.7",
-				"@babel/helper-define-polyfill-provider": "^0.3.3",
-				"semver": "^6.1.1"
-			}
+			"license": "MIT",
+			"optional": true
 		},
-		"babel-plugin-polyfill-corejs3": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-			"integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/figures": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+			"integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.3.3",
-				"core-js-compat": "^3.25.1"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"babel-plugin-polyfill-regenerator": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-			"integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/file-entry-cache": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+			"integrity": "sha512-uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.3.3"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"flat-cache": "^1.2.1",
+				"object-assign": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"babel-runtime": {
-			"version": "6.26.0",
-			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-			"integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/flat-cache": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+			"integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
 			"dev": true,
-			"requires": {
-				"core-js": "^2.4.0",
-				"regenerator-runtime": "^0.11.0"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"regenerator-runtime": {
-					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-					"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-					"dev": true
-				}
+				"circular-json": "^0.3.1",
+				"graceful-fs": "^4.1.2",
+				"rimraf": "~2.6.2",
+				"write": "^0.2.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-eslint/node_modules/ignore": {
+			"version": "3.3.10",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+			"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
 		},
-		"base": {
-			"version": "0.11.2",
-			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/inquirer": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+			"integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
 			"dev": true,
-			"requires": {
-				"cache-base": "^1.0.1",
-				"class-utils": "^0.3.5",
-				"component-emitter": "^1.2.1",
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.1",
-				"mixin-deep": "^1.2.0",
-				"pascalcase": "^0.1.1"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
+				"ansi-escapes": "^3.0.0",
+				"chalk": "^2.0.0",
+				"cli-cursor": "^2.1.0",
+				"cli-width": "^2.0.0",
+				"external-editor": "^2.0.4",
+				"figures": "^2.0.0",
+				"lodash": "^4.3.0",
+				"mute-stream": "0.0.7",
+				"run-async": "^2.2.0",
+				"rx-lite": "^4.0.8",
+				"rx-lite-aggregates": "^4.0.8",
+				"string-width": "^2.1.0",
+				"strip-ansi": "^4.0.0",
+				"through": "^2.3.6"
 			}
 		},
-		"base64-js": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-			"integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw=="
+		"node_modules/@vue/cli-plugin-eslint/node_modules/is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"batch": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-eslint/node_modules/json-schema-traverse": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+			"integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
 		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-			"integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
 			"dev": true,
-			"requires": {
-				"tweetnacl": "^0.14.3"
+			"license": "ISC",
+			"optional": true,
+			"dependencies": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
 			}
 		},
-		"bfj": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-			"integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/mimic-fn": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+			"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
 			"dev": true,
-			"requires": {
-				"bluebird": "^3.5.5",
-				"check-types": "^8.0.3",
-				"hoopy": "^0.1.4",
-				"tryer": "^1.0.1"
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"big.js": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
-		},
-		"binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/onetime": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+			"integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
 			"dev": true,
-			"optional": true
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"mimic-fn": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"bindings": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/regexpp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+			"integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
 			"dev": true,
+			"license": "MIT",
 			"optional": true,
-			"requires": {
-				"file-uri-to-path": "1.0.0"
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"bl": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/restore-cursor": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+			"integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
 			"dev": true,
+			"license": "MIT",
 			"optional": true,
-			"requires": {
-				"buffer": "^5.5.0",
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.4.0"
-			},
 			"dependencies": {
-				"base64-js": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-					"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-					"dev": true,
-					"optional": true
-				},
-				"buffer": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-					"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"base64-js": "^1.3.1",
-						"ieee754": "^1.1.13"
-					}
-				},
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"onetime": "^2.0.0",
+				"signal-exit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"bluebird": {
-			"version": "3.7.2",
-			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-		},
-		"bn.js": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-			"integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-			"dev": true
-		},
-		"body-parser": {
-			"version": "1.20.1",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/rimraf": {
+			"version": "2.6.3",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
 			"dev": true,
-			"requires": {
-				"bytes": "3.1.2",
-				"content-type": "~1.0.4",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"on-finished": "2.4.1",
-				"qs": "6.11.0",
-				"raw-body": "2.5.1",
-				"type-is": "~1.6.18",
-				"unpipe": "1.0.0"
-			},
+			"license": "ISC",
+			"optional": true,
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.11.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-					"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-					"dev": true,
-					"requires": {
-						"side-channel": "^1.0.4"
-					}
-				}
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
 			}
 		},
-		"bonjour": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-			"integrity": "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
 			"dev": true,
-			"requires": {
-				"array-flatten": "^2.1.0",
-				"deep-equal": "^1.0.1",
-				"dns-equal": "^1.0.0",
-				"dns-txt": "^2.0.2",
-				"multicast-dns": "^6.0.1",
-				"multicast-dns-service-types": "^1.1.0"
-			},
-			"dependencies": {
-				"array-flatten": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-					"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-					"dev": true
-				},
-				"deep-equal": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-					"integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-					"dev": true,
-					"requires": {
-						"is-arguments": "^1.0.4",
-						"is-date-object": "^1.0.1",
-						"is-regex": "^1.0.4",
-						"object-is": "^1.0.1",
-						"object-keys": "^1.1.1",
-						"regexp.prototype.flags": "^1.2.0"
-					}
-				}
+			"license": "ISC",
+			"optional": true,
+			"bin": {
+				"semver": "bin/semver"
 			}
 		},
-		"boolbase": {
+		"node_modules/@vue/cli-plugin-eslint/node_modules/slice-ansi": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-			"dev": true
-		},
-		"bootstrap": {
-			"version": "3.4.1",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-			"integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
-		},
-		"brace": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
-			"integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q=="
-		},
-		"brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+			"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
 			"dev": true,
-			"requires": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"is-fullwidth-code-point": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"braces": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/string-width": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
 			"dev": true,
-			"requires": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"brorand": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-			"integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-			"dev": true
-		},
-		"brotli": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz",
-			"integrity": "sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==",
-			"requires": {
-				"base64-js": "^1.1.2"
-			},
+		"node_modules/@vue/cli-plugin-eslint/node_modules/strip-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"base64-js": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-					"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-				}
+				"ansi-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"browser-process-hrtime": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-			"dev": true
-		},
-		"browser-stdout": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-			"dev": true
+		"node_modules/@vue/cli-plugin-eslint/node_modules/table": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+			"integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"optional": true,
+			"dependencies": {
+				"ajv": "^5.2.3",
+				"ajv-keywords": "^2.1.0",
+				"chalk": "^2.1.0",
+				"lodash": "^4.17.4",
+				"slice-ansi": "1.0.0",
+				"string-width": "^2.1.1"
+			}
 		},
-		"browserify-aes": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
-			"requires": {
-				"buffer-xor": "^1.0.3",
-				"cipher-base": "^1.0.0",
-				"create-hash": "^1.1.0",
-				"evp_bytestokey": "^1.0.3",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"os-tmpdir": "~1.0.2"
+			},
+			"engines": {
+				"node": ">=0.6.0"
 			}
 		},
-		"browserify-cipher": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/vue-eslint-parser": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
+			"integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==",
 			"dev": true,
-			"requires": {
-				"browserify-aes": "^1.0.4",
-				"browserify-des": "^1.0.0",
-				"evp_bytestokey": "^1.0.0"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"debug": "^3.1.0",
+				"eslint-scope": "^3.7.1",
+				"eslint-visitor-keys": "^1.0.0",
+				"espree": "^3.5.2",
+				"esquery": "^1.0.0",
+				"lodash": "^4.17.4"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependencies": {
+				"eslint": ">=3.9.0"
 			}
 		},
-		"browserify-des": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/write": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+			"integrity": "sha512-CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA==",
 			"dev": true,
-			"requires": {
-				"cipher-base": "^1.0.1",
-				"des.js": "^1.0.0",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"mkdirp": "^0.5.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"browserify-rsa": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+		"node_modules/@vue/cli-plugin-eslint/node_modules/yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
 			"dev": true,
-			"requires": {
-				"bn.js": "^5.0.0",
-				"randombytes": "^2.0.1"
+			"license": "ISC",
+			"optional": true
+		},
+		"node_modules/@vue/cli-plugin-router": {
+			"version": "4.5.19",
+			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.19.tgz",
+			"integrity": "sha512-3icGzH1IbVYmMMsOwYa0lal/gtvZLebFXdE5hcQJo2mnTwngXGMTyYAzL56EgHBPjbMmRpyj6Iw9k4aVInVX6A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@vue/cli-shared-utils": "^4.5.19"
+			},
+			"peerDependencies": {
+				"@vue/cli-service": "^3.0.0 || ^4.0.0-0"
 			}
 		},
-		"browserify-sign": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+		"node_modules/@vue/cli-plugin-router/node_modules/@vue/cli-shared-utils": {
+			"version": "4.5.19",
+			"resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.19.tgz",
+			"integrity": "sha512-JYpdsrC/d9elerKxbEUtmSSU6QRM60rirVubOewECHkBHj+tLNznWq/EhCjswywtePyLaMUK25eTqnTSZlEE+g==",
 			"dev": true,
-			"requires": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
-				"create-hash": "^1.2.0",
-				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
-				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+			"license": "MIT",
+			"dependencies": {
+				"@achrinza/node-ipc": "9.2.2",
+				"@hapi/joi": "^15.0.1",
+				"chalk": "^2.4.2",
+				"execa": "^1.0.0",
+				"launch-editor": "^2.2.1",
+				"lru-cache": "^5.1.1",
+				"open": "^6.3.0",
+				"ora": "^3.4.0",
+				"read-pkg": "^5.1.1",
+				"request": "^2.88.2",
+				"semver": "^6.1.0",
+				"strip-ansi": "^6.0.0"
 			}
 		},
-		"browserify-zlib": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+		"node_modules/@vue/cli-plugin-unit-mocha": {
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-unit-mocha/-/cli-plugin-unit-mocha-3.11.0.tgz",
+			"integrity": "sha512-VLk6Z4OEWYQ9iSB1A1Pc5wWijOFXYzBs1AvtZernMu9m1M/hzitf1YALSUJrV853CA5u1yaBK4NpyGYm36rKgg==",
 			"dev": true,
-			"requires": {
-				"pako": "~1.0.5"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"pako": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-					"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-					"dev": true
-				}
+				"@vue/cli-shared-utils": "^3.11.0",
+				"jsdom": "^13.2.0",
+				"jsdom-global": "^3.0.2",
+				"mocha": "^5.2.0",
+				"mocha-webpack": "^2.0.0-beta.0"
 			}
 		},
-		"browserslist": {
-			"version": "4.21.4",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-			"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+		"node_modules/@vue/cli-plugin-vuex": {
+			"version": "4.5.19",
+			"resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.19.tgz",
+			"integrity": "sha512-DUmfdkG3pCdkP7Iznd87RfE9Qm42mgp2hcrNcYQYSru1W1gX2dG/JcW8bxmeGSa06lsxi9LEIc/QD1yPajSCZw==",
 			"dev": true,
-			"requires": {
-				"caniuse-lite": "^1.0.30001400",
-				"electron-to-chromium": "^1.4.251",
-				"node-releases": "^2.0.6",
-				"update-browserslist-db": "^1.0.9"
+			"license": "MIT",
+			"peerDependencies": {
+				"@vue/cli-service": "^3.0.0 || ^4.0.0-0"
 			}
 		},
-		"buffer": {
-			"version": "4.9.2",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-			"integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+		"node_modules/@vue/cli-service": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.3.1.tgz",
+			"integrity": "sha512-CsNGfHe+9oKZdRwJmweQ0KsMYM27ssg1eNQqRKL/t+IgDLO3Tu86uaOOCLn4ZAaU5oxxpq4aSFvz+A0YxQRSWw==",
 			"dev": true,
-			"requires": {
-				"base64-js": "^1.0.2",
-				"ieee754": "^1.1.4",
-				"isarray": "^1.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"base64-js": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-					"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-					"dev": true
+				"@intervolga/optimize-cssnano-plugin": "^1.0.5",
+				"@soda/friendly-errors-webpack-plugin": "^1.7.1",
+				"@soda/get-current-script": "^1.0.0",
+				"@vue/cli-overlay": "^4.3.1",
+				"@vue/cli-plugin-router": "^4.3.1",
+				"@vue/cli-plugin-vuex": "^4.3.1",
+				"@vue/cli-shared-utils": "^4.3.1",
+				"@vue/component-compiler-utils": "^3.0.2",
+				"@vue/preload-webpack-plugin": "^1.1.0",
+				"@vue/web-component-wrapper": "^1.2.0",
+				"acorn": "^7.1.0",
+				"acorn-walk": "^7.1.1",
+				"address": "^1.1.2",
+				"autoprefixer": "^9.7.5",
+				"browserslist": "^4.11.1",
+				"cache-loader": "^4.1.0",
+				"case-sensitive-paths-webpack-plugin": "^2.3.0",
+				"cli-highlight": "^2.1.4",
+				"clipboardy": "^2.3.0",
+				"cliui": "^6.0.0",
+				"copy-webpack-plugin": "^5.1.1",
+				"css-loader": "^3.4.2",
+				"cssnano": "^4.1.10",
+				"debug": "^4.1.1",
+				"default-gateway": "^5.0.5",
+				"dotenv": "^8.2.0",
+				"dotenv-expand": "^5.1.0",
+				"file-loader": "^4.2.0",
+				"fs-extra": "^7.0.1",
+				"globby": "^9.2.0",
+				"hash-sum": "^2.0.0",
+				"html-webpack-plugin": "^3.2.0",
+				"launch-editor-middleware": "^2.2.1",
+				"lodash.defaultsdeep": "^4.6.1",
+				"lodash.mapvalues": "^4.6.0",
+				"lodash.transform": "^4.6.0",
+				"mini-css-extract-plugin": "^0.9.0",
+				"minimist": "^1.2.5",
+				"pnp-webpack-plugin": "^1.6.4",
+				"portfinder": "^1.0.25",
+				"postcss-loader": "^3.0.0",
+				"ssri": "^7.1.0",
+				"terser-webpack-plugin": "^2.3.5",
+				"thread-loader": "^2.1.3",
+				"url-loader": "^2.2.0",
+				"vue-loader": "^15.9.1",
+				"vue-style-loader": "^4.1.2",
+				"webpack": "^4.0.0",
+				"webpack-bundle-analyzer": "^3.6.1",
+				"webpack-chain": "^6.4.0",
+				"webpack-dev-server": "^3.10.3",
+				"webpack-merge": "^4.2.2"
+			},
+			"bin": {
+				"vue-cli-service": "bin/vue-cli-service.js"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"peerDependencies": {
+				"vue-template-compiler": "^2.0.0"
+			},
+			"peerDependenciesMeta": {
+				"less-loader": {
+					"optional": true
+				},
+				"pug-plain-loader": {
+					"optional": true
+				},
+				"raw-loader": {
+					"optional": true
+				},
+				"sass-loader": {
+					"optional": true
 				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-					"dev": true
+				"stylus-loader": {
+					"optional": true
+				},
+				"vue-template-compiler": {
+					"optional": true
 				}
 			}
 		},
-		"buffer-crc32": {
-			"version": "0.2.13",
-			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-			"integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-			"dev": true
-		},
-		"buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"dev": true
-		},
-		"buffer-indexof": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-			"integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-			"dev": true
-		},
-		"buffer-json": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz",
-			"integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==",
-			"dev": true
-		},
-		"buffer-xor": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-			"integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-			"dev": true
-		},
-		"builtin-status-codes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-			"integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-			"dev": true
-		},
-		"bytes": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-			"dev": true
-		},
-		"cacache": {
-			"version": "12.0.4",
-			"resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-			"integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+		"node_modules/@vue/cli-service/node_modules/@vue/cli-shared-utils": {
+			"version": "4.5.19",
+			"resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.19.tgz",
+			"integrity": "sha512-JYpdsrC/d9elerKxbEUtmSSU6QRM60rirVubOewECHkBHj+tLNznWq/EhCjswywtePyLaMUK25eTqnTSZlEE+g==",
 			"dev": true,
-			"requires": {
-				"bluebird": "^3.5.5",
-				"chownr": "^1.1.1",
-				"figgy-pudding": "^3.5.1",
-				"glob": "^7.1.4",
-				"graceful-fs": "^4.1.15",
-				"infer-owner": "^1.0.3",
-				"lru-cache": "^5.1.1",
-				"mississippi": "^3.0.0",
-				"mkdirp": "^0.5.1",
-				"move-concurrently": "^1.0.1",
-				"promise-inflight": "^1.0.1",
-				"rimraf": "^2.6.3",
-				"ssri": "^6.0.1",
-				"unique-filename": "^1.1.1",
-				"y18n": "^4.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"yallist": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-					"dev": true
-				}
+				"@achrinza/node-ipc": "9.2.2",
+				"@hapi/joi": "^15.0.1",
+				"chalk": "^2.4.2",
+				"execa": "^1.0.0",
+				"launch-editor": "^2.2.1",
+				"lru-cache": "^5.1.1",
+				"open": "^6.3.0",
+				"ora": "^3.4.0",
+				"read-pkg": "^5.1.1",
+				"request": "^2.88.2",
+				"semver": "^6.1.0",
+				"strip-ansi": "^6.0.0"
 			}
 		},
-		"cache-base": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+		"node_modules/@vue/cli-service/node_modules/css-loader": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
+			"integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
 			"dev": true,
-			"requires": {
-				"collection-visit": "^1.0.0",
-				"component-emitter": "^1.2.1",
-				"get-value": "^2.0.6",
-				"has-value": "^1.0.0",
-				"isobject": "^3.0.1",
-				"set-value": "^2.0.0",
-				"to-object-path": "^0.3.0",
-				"union-value": "^1.0.0",
-				"unset-value": "^1.0.0"
-			}
-		},
-		"cache-loader": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz",
-			"integrity": "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==",
-			"dev": true,
-			"requires": {
-				"buffer-json": "^2.0.0",
-				"find-cache-dir": "^3.0.0",
+			"license": "MIT",
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"cssesc": "^3.0.0",
+				"icss-utils": "^4.1.1",
 				"loader-utils": "^1.2.3",
-				"mkdirp": "^0.5.1",
-				"neo-async": "^2.6.1",
-				"schema-utils": "^2.0.0"
-			}
-		},
-		"cachedir": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-1.3.0.tgz",
-			"integrity": "sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg==",
-			"dev": true,
-			"requires": {
-				"os-homedir": "^1.0.1"
+				"normalize-path": "^3.0.0",
+				"postcss": "^7.0.32",
+				"postcss-modules-extract-imports": "^2.0.0",
+				"postcss-modules-local-by-default": "^3.0.2",
+				"postcss-modules-scope": "^2.2.0",
+				"postcss-modules-values": "^3.0.0",
+				"postcss-value-parser": "^4.1.0",
+				"schema-utils": "^2.7.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
 			}
 		},
-		"call-bind": {
+		"node_modules/@vue/cli-service/node_modules/json5": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"requires": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"call-me-maybe": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-			"integrity": "sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==",
-			"dev": true
-		},
-		"caller-callsite": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-			"integrity": "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==",
+		"node_modules/@vue/cli-service/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
 			"dev": true,
-			"requires": {
-				"callsites": "^2.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"callsites": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-					"integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
-					"dev": true
-				}
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"caller-path": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-			"integrity": "sha512-UJiE1otjXPF5/x+T3zTnSFiTOEmJoGTD9HmBoxnCUwho61a2eSNn/VwtwuIBDAo2SEOv1AJ7ARI5gCmohFLu/g==",
+		"node_modules/@vue/cli-service/node_modules/vue-loader": {
+			"version": "15.11.1",
+			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
+			"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"callsites": "^0.2.0"
+			"license": "MIT",
+			"dependencies": {
+				"@vue/component-compiler-utils": "^3.1.0",
+				"hash-sum": "^1.0.2",
+				"loader-utils": "^1.1.0",
+				"vue-hot-reload-api": "^2.3.0",
+				"vue-style-loader": "^4.1.0"
+			},
+			"peerDependencies": {
+				"css-loader": "*",
+				"webpack": "^3.0.0 || ^4.1.0 || ^5.0.0-0"
+			},
+			"peerDependenciesMeta": {
+				"cache-loader": {
+					"optional": true
+				},
+				"prettier": {
+					"optional": true
+				},
+				"vue-template-compiler": {
+					"optional": true
+				}
 			}
 		},
-		"callsite": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-			"integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==",
-			"dev": true
-		},
-		"callsites": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-			"integrity": "sha512-Zv4Dns9IbXXmPkgRRUjAaJQgfN4xX5p6+RQFhWUqscdvvK2xK/ZL8b3IXIJsj+4sD+f24NwnWy2BY8AJ82JB0A==",
+		"node_modules/@vue/cli-service/node_modules/vue-loader/node_modules/hash-sum": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
 			"dev": true,
-			"optional": true
+			"license": "MIT"
 		},
-		"camel-case": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-			"integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
+		"node_modules/@vue/cli-shared-utils": {
+			"version": "3.12.1",
+			"resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.12.1.tgz",
+			"integrity": "sha512-jFblzRFjutGwu5utOKdVlPlsbA1lBUNNQlAThzNqej+JtTKJjnvjlhjKX0Gq0oOny5FjKWhoyfQ74p9h1qE6JQ==",
 			"dev": true,
-			"requires": {
-				"no-case": "^2.2.0",
-				"upper-case": "^1.1.1"
+			"license": "MIT",
+			"dependencies": {
+				"@hapi/joi": "^15.0.1",
+				"chalk": "^2.4.1",
+				"execa": "^1.0.0",
+				"launch-editor": "^2.2.1",
+				"lru-cache": "^5.1.1",
+				"node-ipc": "^9.1.1",
+				"open": "^6.3.0",
+				"ora": "^3.4.0",
+				"request": "^2.87.0",
+				"request-promise-native": "^1.0.7",
+				"semver": "^6.0.0",
+				"string.prototype.padstart": "^3.0.0"
 			}
 		},
-		"camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+		"node_modules/@vue/compiler-sfc": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+			"integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
+			"dependencies": {
+				"@babel/parser": "^7.23.5",
+				"postcss": "^8.4.14",
+				"source-map": "^0.6.1"
+			},
+			"optionalDependencies": {
+				"prettier": "^1.18.2 || ^2.0.0"
+			}
+		},
+		"node_modules/@vue/compiler-sfc/node_modules/postcss": {
+			"version": "8.4.47",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+			"integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"nanoid": "^3.3.7",
+				"picocolors": "^1.1.0",
+				"source-map-js": "^1.2.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			}
 		},
-		"caniuse-api": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-lite": "^1.0.0",
-				"lodash.memoize": "^4.1.2",
-				"lodash.uniq": "^4.5.0"
+		"node_modules/@vue/component-compiler-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
+			"integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
+			"license": "MIT",
+			"dependencies": {
+				"consolidate": "^0.15.1",
+				"hash-sum": "^1.0.2",
+				"lru-cache": "^4.1.2",
+				"merge-source-map": "^1.1.0",
+				"postcss": "^7.0.36",
+				"postcss-selector-parser": "^6.0.2",
+				"source-map": "~0.6.1",
+				"vue-template-es2015-compiler": "^1.9.0"
+			},
+			"optionalDependencies": {
+				"prettier": "^1.18.2 || ^2.0.0"
 			}
 		},
-		"caniuse-lite": {
-			"version": "1.0.30001420",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001420.tgz",
-			"integrity": "sha512-OnyeJ9ascFA9roEj72ok2Ikp7PHJTKubtEJIQ/VK3fdsS50q4KWy+Z5X0A1/GswEItKX0ctAp8n4SYDE7wTu6A==",
-			"dev": true
+		"node_modules/@vue/component-compiler-utils/node_modules/hash-sum": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+			"license": "MIT"
 		},
-		"canvg": {
-			"version": "3.0.10",
-			"resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
-			"integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",
-			"requires": {
-				"@babel/runtime": "^7.12.5",
-				"@types/raf": "^3.4.0",
-				"core-js": "^3.8.3",
-				"raf": "^3.4.1",
-				"regenerator-runtime": "^0.13.7",
-				"rgbcolor": "^1.0.1",
-				"stackblur-canvas": "^2.0.0",
-				"svg-pathdata": "^6.0.3"
-			},
+		"node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+			"license": "ISC",
 			"dependencies": {
-				"core-js": {
-					"version": "3.25.5",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz",
-					"integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="
-				}
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
 			}
 		},
-		"case-sensitive-paths-webpack-plugin": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-			"integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
-			"dev": true
-		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-			"dev": true
+		"node_modules/@vue/component-compiler-utils/node_modules/yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+			"license": "ISC"
 		},
-		"cfb": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
-			"integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
-			"requires": {
-				"adler-32": "~1.3.0",
-				"crc-32": "~1.2.0"
+		"node_modules/@vue/preload-webpack-plugin": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz",
+			"integrity": "sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=6.0.0"
 			},
-			"dependencies": {
-				"adler-32": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
-					"integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
-				}
+			"peerDependencies": {
+				"html-webpack-plugin": ">=2.26.0",
+				"webpack": ">=4.0.0"
 			}
 		},
-		"chai": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
-			"integrity": "sha512-YTHf80rJ8M5/cJoFKEV1y3PnexbGs0vSHjouRRU8gLM05Nc3Mqq9zor/P4SCqB/sgvKRLvya7wHLC1XQ9pTjgQ==",
+		"node_modules/@vue/test-utils": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.3.6.tgz",
+			"integrity": "sha512-udMmmF1ts3zwxUJEIAj5ziioR900reDrt6C9H3XpWPsLBx2lpHKoA4BTdd9HNIYbkGltWw+JjWJ+5O6QBwiyEw==",
 			"dev": true,
-			"requires": {
-				"assertion-error": "^1.0.1",
-				"check-error": "^1.0.1",
-				"deep-eql": "^3.0.0",
-				"get-func-name": "^2.0.0",
-				"pathval": "^1.0.0",
-				"type-detect": "^4.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"dom-event-types": "^1.0.0",
+				"lodash": "^4.17.15",
+				"pretty": "^2.0.0"
+			},
+			"peerDependencies": {
+				"vue": "2.x",
+				"vue-template-compiler": "^2.x"
 			}
 		},
-		"chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+		"node_modules/@vue/web-component-wrapper": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
+			"integrity": "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==",
 			"dev": true,
-			"requires": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/ast": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+			"integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+			"license": "MIT",
 			"dependencies": {
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
+				"@webassemblyjs/helper-module-context": "1.9.0",
+				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+				"@webassemblyjs/wast-parser": "1.9.0"
 			}
 		},
-		"chardet": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-			"integrity": "sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==",
-			"dev": true,
-			"optional": true
+		"node_modules/@webassemblyjs/floating-point-hex-parser": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+			"integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+			"license": "MIT"
 		},
-		"charenc": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-			"integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
-			"dev": true
+		"node_modules/@webassemblyjs/helper-api-error": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+			"integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+			"license": "MIT"
 		},
-		"check-error": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-			"integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
-			"dev": true
+		"node_modules/@webassemblyjs/helper-buffer": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+			"integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+			"license": "MIT"
 		},
-		"check-more-types": {
-			"version": "2.24.0",
-			"resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-			"integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
-			"dev": true
+		"node_modules/@webassemblyjs/helper-code-frame": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+			"integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/wast-printer": "1.9.0"
+			}
 		},
-		"check-types": {
-			"version": "8.0.3",
-			"resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-			"integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
-			"dev": true
+		"node_modules/@webassemblyjs/helper-fsm": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+			"integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
+			"license": "ISC"
 		},
-		"chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"anymatch": "~3.1.2",
-				"braces": "~3.0.2",
-				"fsevents": "~2.3.2",
-				"glob-parent": "~5.1.2",
-				"is-binary-path": "~2.1.0",
-				"is-glob": "~4.0.1",
-				"normalize-path": "~3.0.0",
-				"readdirp": "~3.6.0"
-			},
+		"node_modules/@webassemblyjs/helper-module-context": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+			"integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+			"license": "MIT",
 			"dependencies": {
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true,
-					"optional": true
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"@webassemblyjs/ast": "1.9.0"
 			}
 		},
-		"chownr": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-			"dev": true
+		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+			"integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+			"license": "MIT"
 		},
-		"chrome-trace-event": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-			"dev": true
+		"node_modules/@webassemblyjs/helper-wasm-section": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+			"integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.9.0",
+				"@webassemblyjs/helper-buffer": "1.9.0",
+				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+				"@webassemblyjs/wasm-gen": "1.9.0"
+			}
 		},
-		"ci-info": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-			"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-			"dev": true
+		"node_modules/@webassemblyjs/ieee754": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+			"integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+			"license": "MIT",
+			"dependencies": {
+				"@xtuc/ieee754": "^1.2.0"
+			}
 		},
-		"cipher-base": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
+		"node_modules/@webassemblyjs/leb128": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+			"integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+			"license": "MIT",
+			"dependencies": {
+				"@xtuc/long": "4.2.2"
 			}
 		},
-		"circular-json": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-			"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-			"dev": true,
-			"optional": true
+		"node_modules/@webassemblyjs/utf8": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+			"integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+			"license": "MIT"
 		},
-		"class-utils": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-			"dev": true,
-			"requires": {
-				"arr-union": "^3.1.0",
-				"define-property": "^0.2.5",
-				"isobject": "^3.0.0",
-				"static-extend": "^0.1.1"
-			},
+		"node_modules/@webassemblyjs/wasm-edit": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+			"integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+			"license": "MIT",
 			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
+				"@webassemblyjs/ast": "1.9.0",
+				"@webassemblyjs/helper-buffer": "1.9.0",
+				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+				"@webassemblyjs/helper-wasm-section": "1.9.0",
+				"@webassemblyjs/wasm-gen": "1.9.0",
+				"@webassemblyjs/wasm-opt": "1.9.0",
+				"@webassemblyjs/wasm-parser": "1.9.0",
+				"@webassemblyjs/wast-printer": "1.9.0"
 			}
 		},
-		"clean-css": {
-			"version": "4.2.4",
-			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
-			"integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
-			"dev": true,
-			"requires": {
-				"source-map": "~0.6.0"
+		"node_modules/@webassemblyjs/wasm-gen": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+			"integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.9.0",
+				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+				"@webassemblyjs/ieee754": "1.9.0",
+				"@webassemblyjs/leb128": "1.9.0",
+				"@webassemblyjs/utf8": "1.9.0"
 			}
 		},
-		"clean-stack": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-			"dev": true
-		},
-		"cli-cursor": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-			"integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
-			"dev": true,
-			"requires": {
-				"restore-cursor": "^2.0.0"
+		"node_modules/@webassemblyjs/wasm-opt": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+			"integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.9.0",
+				"@webassemblyjs/helper-buffer": "1.9.0",
+				"@webassemblyjs/wasm-gen": "1.9.0",
+				"@webassemblyjs/wasm-parser": "1.9.0"
 			}
 		},
-		"cli-highlight": {
-			"version": "2.1.11",
-			"resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
-			"integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"highlight.js": "^10.7.1",
-				"mz": "^2.4.0",
-				"parse5": "^5.1.1",
-				"parse5-htmlparser2-tree-adapter": "^6.0.0",
-				"yargs": "^16.0.0"
-			},
+		"node_modules/@webassemblyjs/wasm-parser": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+			"integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cliui": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-					"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"get-caller-file": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"parse5": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-					"integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "16.2.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-					"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-					"dev": true,
-					"requires": {
-						"cliui": "^7.0.2",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.0",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^20.2.2"
-					}
-				},
-				"yargs-parser": {
-					"version": "20.2.9",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-					"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-					"dev": true
-				}
+				"@webassemblyjs/ast": "1.9.0",
+				"@webassemblyjs/helper-api-error": "1.9.0",
+				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+				"@webassemblyjs/ieee754": "1.9.0",
+				"@webassemblyjs/leb128": "1.9.0",
+				"@webassemblyjs/utf8": "1.9.0"
 			}
 		},
-		"cli-spinners": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
-			"integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
-			"dev": true
+		"node_modules/@webassemblyjs/wast-parser": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+			"integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.9.0",
+				"@webassemblyjs/floating-point-hex-parser": "1.9.0",
+				"@webassemblyjs/helper-api-error": "1.9.0",
+				"@webassemblyjs/helper-code-frame": "1.9.0",
+				"@webassemblyjs/helper-fsm": "1.9.0",
+				"@xtuc/long": "4.2.2"
+			}
 		},
-		"cli-table3": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
-			"integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
-			"dev": true,
-			"requires": {
-				"colors": "^1.1.2",
-				"object-assign": "^4.1.0",
-				"string-width": "^2.1.1"
-			},
+		"node_modules/@webassemblyjs/wast-printer": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+			"integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
+				"@webassemblyjs/ast": "1.9.0",
+				"@webassemblyjs/wast-parser": "1.9.0",
+				"@xtuc/long": "4.2.2"
 			}
 		},
-		"cli-truncate": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
-			"integrity": "sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg==",
+		"node_modules/@xtuc/ieee754": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/@xtuc/long": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+			"license": "Apache-2.0"
+		},
+		"node_modules/abab": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+			"deprecated": "Use your platform's native atob() and btoa() methods instead",
 			"dev": true,
-			"requires": {
-				"slice-ansi": "0.0.4",
-				"string-width": "^1.0.1"
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/abbrev": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+			"integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"cli-width": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-			"dev": true
+		"node_modules/accepts": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mime-types": "~2.1.34",
+				"negotiator": "0.6.3"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"clipboardy": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
-			"integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==",
+		"node_modules/acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
 			"dev": true,
-			"requires": {
-				"arch": "^2.1.1",
-				"execa": "^1.0.0",
-				"is-wsl": "^2.1.1"
+			"license": "MIT",
+			"bin": {
+				"acorn": "bin/acorn"
 			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-globals": {
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+			"integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"is-wsl": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-					"dev": true,
-					"requires": {
-						"is-docker": "^2.0.0"
-					}
-				}
+				"acorn": "^6.0.1",
+				"acorn-walk": "^6.0.1"
 			}
 		},
-		"cliui": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-			"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+		"node_modules/acorn-globals/node_modules/acorn": {
+			"version": "6.4.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
 			"dev": true,
-			"requires": {
-				"string-width": "^2.1.1",
-				"strip-ansi": "^4.0.0",
-				"wrap-ansi": "^2.0.0"
+			"license": "MIT",
+			"bin": {
+				"acorn": "bin/acorn"
 			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
+			"engines": {
+				"node": ">=0.4.0"
 			}
 		},
-		"clone": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+		"node_modules/acorn-globals/node_modules/acorn-walk": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+			"integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.4.0"
+			}
 		},
-		"clone-deep": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
 			"dev": true,
-			"requires": {
-				"is-plain-object": "^2.0.4",
-				"kind-of": "^6.0.2",
-				"shallow-clone": "^3.0.0"
+			"license": "MIT",
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
-		},
-		"coa": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-			"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+		"node_modules/acorn-walk": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
 			"dev": true,
-			"requires": {
-				"@types/q": "^1.5.1",
-				"chalk": "^2.4.1",
-				"q": "^1.1.2"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.4.0"
 			}
 		},
-		"code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
-			"dev": true
+		"node_modules/address": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
+			"integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 10.0.0"
+			}
 		},
-		"codepage": {
-			"version": "1.14.0",
-			"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
-			"integrity": "sha512-iz3zJLhlrg37/gYRWgEPkaFTtzmnEv1h+r7NgZum2lFElYQPi0/5bnmuDfODHxfp0INEfnRqyfyeIJDbb7ahRw==",
-			"requires": {
-				"commander": "~2.14.1",
-				"exit-on-epipe": "~1.0.1"
-			},
+		"node_modules/adler-32": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
+			"integrity": "sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==",
+			"license": "Apache-2.0",
 			"dependencies": {
-				"commander": {
-					"version": "2.14.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-					"integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
-				}
+				"exit-on-epipe": "~1.0.1",
+				"printj": "~1.1.0"
+			},
+			"bin": {
+				"adler32": "bin/adler32.njs"
+			},
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"collection-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-			"integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+		"node_modules/ag-charts-types": {
+			"version": "10.2.0",
+			"resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-10.2.0.tgz",
+			"integrity": "sha512-PUqH1QtugpYLnlbMdeSZVf5PpT1XZVsP69qN1JXhetLtQpVC28zaj7ikwu9CMA9N9b+dBboA9QcjUQUJZVUokQ==",
 			"dev": true,
-			"requires": {
-				"map-visit": "^1.0.0",
-				"object-visit": "^1.0.0"
-			}
+			"license": "MIT"
 		},
-		"color": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-			"integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+		"node_modules/ag-grid-community": {
+			"version": "32.2.0",
+			"resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-32.2.0.tgz",
+			"integrity": "sha512-zr29DGo6U4JR6pSOgZrZWuN1CTWdpUCfZWWpF47us6MzdFWGN5gcdiXGw40wg9XMGacShNX1aW8o33S4yVkzMw==",
 			"dev": true,
-			"requires": {
-				"color-convert": "^1.9.3",
-				"color-string": "^1.6.0"
+			"license": "MIT",
+			"dependencies": {
+				"ag-charts-types": "10.2.0"
 			}
 		},
-		"color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+		"node_modules/aggregate-error": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
 			"dev": true,
-			"requires": {
-				"color-name": "1.1.3"
+			"license": "MIT",
+			"dependencies": {
+				"clean-stack": "^2.0.0",
+				"indent-string": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-			"dev": true
+		"node_modules/ajv": {
+			"version": "6.12.3",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+			"integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
 		},
-		"color-string": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-			"integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-			"dev": true,
-			"requires": {
-				"color-name": "^1.0.0",
-				"simple-swizzle": "^0.2.2"
+		"node_modules/ajv-errors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+			"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+			"license": "MIT",
+			"peerDependencies": {
+				"ajv": ">=5.0.0"
 			}
 		},
-		"colors": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-			"integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+		"node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"license": "MIT",
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
+		"node_modules/alphanum-sort": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+			"integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
 			"dev": true,
-			"optional": true
+			"license": "MIT"
 		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+		"node_modules/ansi-colors": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+			"integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
 			"dev": true,
-			"requires": {
-				"delayed-stream": "~1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-		},
-		"common-tags": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
-			"integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==",
-			"dev": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-			"dev": true
-		},
-		"component-emitter": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-			"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-			"dev": true
-		},
-		"compressible": {
-			"version": "2.0.18",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+		"node_modules/ansi-escapes": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+			"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
 			"dev": true,
-			"requires": {
-				"mime-db": ">= 1.43.0 < 2"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"compression": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+		"node_modules/ansi-html-community": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
 			"dev": true,
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.16",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.2",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			},
-			"dependencies": {
-				"bytes": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-					"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-					"dev": true
-				}
+			"engines": [
+				"node >= 0.8.0"
+			],
+			"license": "Apache-2.0",
+			"bin": {
+				"ansi-html": "bin/ansi-html"
 			}
 		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-			"dev": true
-		},
-		"concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"condense-newlines": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz",
-			"integrity": "sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==",
+		"node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 			"dev": true,
-			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-whitespace": "^0.3.0",
-				"kind-of": "^3.0.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"config-chain": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-			"integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+		"node_modules/any-promise": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+			"integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
 			"dev": true,
-			"requires": {
-				"ini": "^1.3.4",
-				"proto-list": "~1.2.1"
+			"license": "MIT"
+		},
+		"node_modules/anymatch": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+			"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+			"devOptional": true,
+			"license": "ISC",
+			"dependencies": {
+				"micromatch": "^3.1.4",
+				"normalize-path": "^2.1.1"
 			}
 		},
-		"connect-history-api-fallback": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-			"dev": true
+		"node_modules/anymatch/node_modules/normalize-path": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+			"integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+			"devOptional": true,
+			"license": "MIT",
+			"dependencies": {
+				"remove-trailing-separator": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"console-browserify": {
+		"node_modules/aproba": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-			"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+			"license": "ISC"
 		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+		"node_modules/arch": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+			"integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
 			"dev": true,
-			"optional": true
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"license": "MIT"
 		},
-		"consolidate": {
-			"version": "0.15.1",
-			"resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-			"integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-			"requires": {
-				"bluebird": "^3.1.1"
+		"node_modules/are-we-there-yet": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+			"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+			"deprecated": "This package is no longer supported.",
+			"dev": true,
+			"license": "ISC",
+			"optional": true,
+			"dependencies": {
+				"delegates": "^1.0.0",
+				"readable-stream": "^2.0.6"
 			}
 		},
-		"constants-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-			"dev": true
-		},
-		"content-disposition": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+		"node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 			"dev": true,
-			"requires": {
-				"safe-buffer": "5.2.1"
+			"license": "MIT",
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
 			}
 		},
-		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-			"dev": true
+		"node_modules/arr-diff": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+			"integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"convert-source-map": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-			"dev": true
+		"node_modules/arr-flatten": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-			"dev": true
+		"node_modules/arr-union": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+			"integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-			"dev": true
+		"node_modules/array-buffer-byte-length": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+			"integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.5",
+				"is-array-buffer": "^3.0.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"copy-concurrently": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+		"node_modules/array-equal": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.2.tgz",
+			"integrity": "sha512-gUHx76KtnhEgB3HOuFYiCm3FIdEs6ocM2asHvNTkfu/Y09qQVrrVVaOKENmS2KkSaGoxgXNqC+ZVtR/n0MOkSA==",
 			"dev": true,
-			"requires": {
-				"aproba": "^1.1.1",
-				"fs-write-stream-atomic": "^1.0.8",
-				"iferr": "^0.1.5",
-				"mkdirp": "^0.5.1",
-				"rimraf": "^2.5.4",
-				"run-queue": "^1.0.0"
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-			"dev": true
+		"node_modules/array-flatten": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"copy-webpack-plugin": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz",
-			"integrity": "sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ==",
+		"node_modules/array-union": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+			"integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
 			"dev": true,
-			"requires": {
-				"cacache": "^12.0.3",
-				"find-cache-dir": "^2.1.0",
-				"glob-parent": "^3.1.0",
-				"globby": "^7.1.1",
-				"is-glob": "^4.0.1",
-				"loader-utils": "^1.2.3",
-				"minimatch": "^3.0.4",
-				"normalize-path": "^3.0.0",
-				"p-limit": "^2.2.1",
-				"schema-utils": "^1.0.0",
-				"serialize-javascript": "^4.0.0",
-				"webpack-log": "^2.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"find-cache-dir": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^2.0.0",
-						"pkg-dir": "^3.0.0"
-					}
-				},
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-							"dev": true,
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				},
-				"globby": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-					"integrity": "sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "^2.0.0",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-							"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-							"dev": true
-						}
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"make-dir": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-					"dev": true,
-					"requires": {
-						"pify": "^4.0.1",
-						"semver": "^5.6.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
-				},
-				"schema-utils": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
-					}
-				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				},
-				"slash": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-					"integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
-					"dev": true
-				}
+				"array-uniq": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"core-js": {
-			"version": "2.6.5",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
-			"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="
-		},
-		"core-js-compat": {
-			"version": "3.25.5",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.5.tgz",
-			"integrity": "sha512-ovcyhs2DEBUIE0MGEKHP4olCUW/XYte3Vroyxuh38rD1wAO4dHohsovUC4eAOuzFxE6b+RXvBU3UZ9o0YhUTkA==",
+		"node_modules/array-uniq": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+			"integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-			"dev": true
+		"node_modules/array-unique": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+			"integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"cosmiconfig": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-			"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+		"node_modules/array.prototype.reduce": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz",
+			"integrity": "sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==",
 			"dev": true,
-			"requires": {
-				"import-fresh": "^2.0.0",
-				"is-directory": "^0.3.1",
-				"js-yaml": "^3.13.1",
-				"parse-json": "^4.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.2",
+				"es-array-method-boxes-properly": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.0.0",
+				"is-string": "^1.0.7"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"crc-32": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
-			"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
-		},
-		"create-ecdh": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+		"node_modules/arraybuffer.prototype.slice": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+			"integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
 			"dev": true,
-			"requires": {
-				"bn.js": "^4.1.0",
-				"elliptic": "^6.5.3"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
+				"array-buffer-byte-length": "^1.0.1",
+				"call-bind": "^1.0.5",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.22.3",
+				"es-errors": "^1.2.1",
+				"get-intrinsic": "^1.2.3",
+				"is-array-buffer": "^3.0.4",
+				"is-shared-array-buffer": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"create-hash": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+		"node_modules/asn1": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+			"integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
 			"dev": true,
-			"requires": {
-				"cipher-base": "^1.0.1",
-				"inherits": "^2.0.1",
-				"md5.js": "^1.3.4",
-				"ripemd160": "^2.0.1",
-				"sha.js": "^2.4.0"
+			"license": "MIT",
+			"dependencies": {
+				"safer-buffer": "~2.1.0"
 			}
 		},
-		"create-hmac": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-			"dev": true,
-			"requires": {
-				"cipher-base": "^1.0.3",
-				"create-hash": "^1.1.0",
+		"node_modules/asn1.js": {
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+			"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+			"license": "MIT",
+			"dependencies": {
+				"bn.js": "^4.0.0",
 				"inherits": "^2.0.1",
-				"ripemd160": "^2.0.0",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
+				"minimalistic-assert": "^1.0.0"
 			}
 		},
-		"cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-			"dev": true,
-			"requires": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
-			},
+		"node_modules/asn1.js/node_modules/bn.js": {
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"license": "MIT"
+		},
+		"node_modules/assert": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+			"integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
+			"license": "MIT",
 			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				}
+				"object.assign": "^4.1.4",
+				"util": "^0.10.4"
 			}
 		},
-		"crypt": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-			"integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
-			"dev": true
-		},
-		"crypto-browserify": {
-			"version": "3.12.0",
-			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+		"node_modules/assert-plus": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+			"integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
 			"dev": true,
-			"requires": {
-				"browserify-cipher": "^1.0.0",
-				"browserify-sign": "^4.0.0",
-				"create-ecdh": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"create-hmac": "^1.1.0",
-				"diffie-hellman": "^5.0.0",
-				"inherits": "^2.0.1",
-				"pbkdf2": "^3.0.3",
-				"public-encrypt": "^4.0.0",
-				"randombytes": "^2.0.0",
-				"randomfill": "^1.0.3"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"crypto-js": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
-			"integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+		"node_modules/assert/node_modules/inherits": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+			"license": "ISC"
+		},
+		"node_modules/assert/node_modules/util": {
+			"version": "0.10.4",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+			"integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "2.0.3"
+			}
 		},
-		"css-color-names": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-			"integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
-			"dev": true
+		"node_modules/assertion-error": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+			"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "*"
+			}
 		},
-		"css-declaration-sorter": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-			"integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+		"node_modules/assign-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+			"integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.1",
-				"timsort": "^0.3.0"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"css-element-queries": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/css-element-queries/-/css-element-queries-1.2.1.tgz",
-			"integrity": "sha512-hiI1tSzf+U/gE13qhfwnCvN90Ay0THnE+mT3pjN/c/mvFmEUHZVNrvMJrrkw2ppOzkl69FdgH2ZGZENYQUaN2A=="
+		"node_modules/async": {
+			"version": "3.2.6",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+			"integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"css-loader": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.2.0.tgz",
-			"integrity": "sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ==",
-			"requires": {
-				"camelcase": "^5.3.1",
-				"cssesc": "^3.0.0",
-				"icss-utils": "^4.1.1",
-				"loader-utils": "^1.2.3",
-				"normalize-path": "^3.0.0",
-				"postcss": "^7.0.17",
-				"postcss-modules-extract-imports": "^2.0.0",
-				"postcss-modules-local-by-default": "^3.0.2",
-				"postcss-modules-scope": "^2.1.0",
-				"postcss-modules-values": "^3.0.0",
-				"postcss-value-parser": "^4.0.0",
-				"schema-utils": "^2.0.0"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
+		"node_modules/async-each": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
+			"integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
+			"devOptional": true,
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://paulmillr.com/funding/"
 				}
-			}
+			],
+			"license": "MIT"
 		},
-		"css-select": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-			"integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+		"node_modules/async-limiter": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+			"integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
 			"dev": true,
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-what": "^3.2.1",
-				"domutils": "^1.7.0",
-				"nth-check": "^1.0.2"
-			}
+			"license": "MIT"
 		},
-		"css-select-base-adapter": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-			"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-			"dev": true
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"css-tree": {
-			"version": "1.0.0-alpha.37",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-			"integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+		"node_modules/at-least-node": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+			"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
 			"dev": true,
-			"requires": {
-				"mdn-data": "2.0.4",
-				"source-map": "^0.6.1"
+			"license": "ISC",
+			"engines": {
+				"node": ">= 4.0.0"
 			}
 		},
-		"css-what": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-			"integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-			"dev": true
-		},
-		"cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+		"node_modules/atob": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+			"license": "(MIT OR Apache-2.0)",
+			"bin": {
+				"atob": "bin/atob.js"
+			},
+			"engines": {
+				"node": ">= 4.5.0"
+			}
 		},
-		"cssnano": {
-			"version": "4.1.11",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
-			"integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
+		"node_modules/autoprefixer": {
+			"version": "9.8.8",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz",
+			"integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
 			"dev": true,
-			"requires": {
-				"cosmiconfig": "^5.0.0",
-				"cssnano-preset-default": "^4.0.8",
-				"is-resolvable": "^1.0.0",
-				"postcss": "^7.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"browserslist": "^4.12.0",
+				"caniuse-lite": "^1.0.30001109",
+				"normalize-range": "^0.1.2",
+				"num2fraction": "^1.2.2",
+				"picocolors": "^0.2.1",
+				"postcss": "^7.0.32",
+				"postcss-value-parser": "^4.1.0"
+			},
+			"bin": {
+				"autoprefixer": "bin/autoprefixer"
+			},
+			"funding": {
+				"type": "tidelift",
+				"url": "https://tidelift.com/funding/github/npm/autoprefixer"
 			}
 		},
-		"cssnano-preset-default": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
-			"integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
+		"node_modules/autoprefixer/node_modules/picocolors": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+			"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
 			"dev": true,
-			"requires": {
-				"css-declaration-sorter": "^4.0.1",
-				"cssnano-util-raw-cache": "^4.0.1",
-				"postcss": "^7.0.0",
-				"postcss-calc": "^7.0.1",
-				"postcss-colormin": "^4.0.3",
-				"postcss-convert-values": "^4.0.1",
-				"postcss-discard-comments": "^4.0.2",
-				"postcss-discard-duplicates": "^4.0.2",
-				"postcss-discard-empty": "^4.0.1",
-				"postcss-discard-overridden": "^4.0.1",
-				"postcss-merge-longhand": "^4.0.11",
-				"postcss-merge-rules": "^4.0.3",
-				"postcss-minify-font-values": "^4.0.2",
-				"postcss-minify-gradients": "^4.0.2",
-				"postcss-minify-params": "^4.0.2",
-				"postcss-minify-selectors": "^4.0.2",
-				"postcss-normalize-charset": "^4.0.1",
-				"postcss-normalize-display-values": "^4.0.2",
-				"postcss-normalize-positions": "^4.0.2",
-				"postcss-normalize-repeat-style": "^4.0.2",
-				"postcss-normalize-string": "^4.0.2",
-				"postcss-normalize-timing-functions": "^4.0.2",
-				"postcss-normalize-unicode": "^4.0.1",
-				"postcss-normalize-url": "^4.0.1",
-				"postcss-normalize-whitespace": "^4.0.2",
-				"postcss-ordered-values": "^4.1.2",
-				"postcss-reduce-initial": "^4.0.3",
-				"postcss-reduce-transforms": "^4.0.2",
-				"postcss-svgo": "^4.0.3",
-				"postcss-unique-selectors": "^4.0.1"
-			},
+			"license": "ISC"
+		},
+		"node_modules/available-typed-arrays": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+			"integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"possible-typed-array-names": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"cssnano-util-get-arguments": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-			"integrity": "sha512-6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw==",
-			"dev": true
-		},
-		"cssnano-util-get-match": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-			"integrity": "sha512-JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw==",
-			"dev": true
+		"node_modules/aws-sign2": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+			"integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "*"
+			}
 		},
-		"cssnano-util-raw-cache": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-			"integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+		"node_modules/aws4": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+			"integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
-			},
+			"license": "MIT"
+		},
+		"node_modules/axios": {
+			"version": "0.21.4",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+			"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"follow-redirects": "^1.14.0"
 			}
 		},
-		"cssnano-util-same-parent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-			"integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-			"dev": true
-		},
-		"csso": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+		"node_modules/babel-code-frame": {
+			"version": "6.26.0",
+			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+			"integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
 			"dev": true,
-			"requires": {
-				"css-tree": "^1.1.2"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"css-tree": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-					"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-					"dev": true,
-					"requires": {
-						"mdn-data": "2.0.14",
-						"source-map": "^0.6.1"
-					}
-				},
-				"mdn-data": {
-					"version": "2.0.14",
-					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-					"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-					"dev": true
-				}
+				"chalk": "^1.1.3",
+				"esutils": "^2.0.2",
+				"js-tokens": "^3.0.2"
 			}
 		},
-		"cssom": {
-			"version": "0.3.8",
-			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-			"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-			"dev": true
+		"node_modules/babel-code-frame/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"cssstyle": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-			"integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+		"node_modules/babel-code-frame/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
 			"dev": true,
-			"requires": {
-				"cssom": "0.3.x"
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"csstype": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-			"integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+		"node_modules/babel-code-frame/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"cyclist": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-			"integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==",
-			"dev": true
+		"node_modules/babel-code-frame/node_modules/js-tokens": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+			"integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
 		},
-		"cypress": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/cypress/-/cypress-4.0.1.tgz",
-			"integrity": "sha512-P+cSwc5yE+1hIkWwJzpsiSQthKmzkFeFz2ySejSrJJ6FiXoL8pp0vr1cyWp+75KT4nqL9IYt1GMrHp+mVmvocA==",
+		"node_modules/babel-code-frame/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
 			"dev": true,
-			"requires": {
-				"@cypress/listr-verbose-renderer": "0.4.1",
-				"@cypress/xvfb": "1.2.4",
-				"@types/sizzle": "2.3.2",
-				"arch": "2.1.1",
-				"bluebird": "3.7.2",
-				"cachedir": "2.3.0",
-				"chalk": "3.0.0",
-				"check-more-types": "2.24.0",
-				"commander": "4.1.0",
-				"common-tags": "1.8.0",
-				"debug": "4.1.1",
-				"eventemitter2": "4.1.2",
-				"execa": "3.3.0",
-				"executable": "4.1.1",
-				"extract-zip": "1.6.7",
-				"fs-extra": "8.1.0",
-				"getos": "3.1.4",
-				"is-ci": "2.0.0",
-				"is-installed-globally": "0.1.0",
-				"lazy-ass": "1.6.0",
-				"listr": "0.14.3",
-				"lodash": "4.17.15",
-				"log-symbols": "3.0.0",
-				"minimist": "1.2.0",
-				"moment": "2.24.0",
-				"ramda": "0.26.1",
-				"request": "2.88.0",
-				"request-progress": "3.0.0",
-				"supports-color": "7.1.0",
-				"tmp": "0.1.0",
-				"untildify": "4.0.0",
-				"url": "0.11.0",
-				"yauzl": "2.10.0"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"ansi-escapes": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-					"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"async": {
-					"version": "3.2.4",
-					"resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-					"integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
-					"dev": true
-				},
-				"cachedir": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
-					"integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"ci-info": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-					"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-					"dev": true
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"commander": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz",
-					"integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"execa": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-3.3.0.tgz",
-					"integrity": "sha512-j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"get-stream": "^5.0.0",
-						"human-signals": "^1.1.1",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.0",
-						"onetime": "^5.1.0",
-						"p-finally": "^2.0.0",
-						"signal-exit": "^3.0.2",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"fs-extra": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-					"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"get-stream": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-					"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"getos": {
-					"version": "3.1.4",
-					"resolved": "https://registry.npmjs.org/getos/-/getos-3.1.4.tgz",
-					"integrity": "sha512-UORPzguEB/7UG5hqiZai8f0vQ7hzynMQyJLxStoQ8dPGAcmgsfXOPA4iE/fGtweHYkK+z4zc9V0g+CIFRf5HYw==",
-					"dev": true,
-					"requires": {
-						"async": "^3.1.0"
-					}
-				},
-				"indent-string": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-					"integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
-					"dev": true
-				},
-				"is-ci": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-					"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-					"dev": true,
-					"requires": {
-						"ci-info": "^2.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"listr": {
-					"version": "0.14.3",
-					"resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz",
-					"integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==",
-					"dev": true,
-					"requires": {
-						"@samverschueren/stream-to-observable": "^0.3.0",
-						"is-observable": "^1.1.0",
-						"is-promise": "^2.1.0",
-						"is-stream": "^1.1.0",
-						"listr-silent-renderer": "^1.1.1",
-						"listr-update-renderer": "^0.5.0",
-						"listr-verbose-renderer": "^0.5.0",
-						"p-map": "^2.0.0",
-						"rxjs": "^6.3.3"
-					},
-					"dependencies": {
-						"is-stream": {
-							"version": "1.1.0",
-							"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-							"integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-							"dev": true
-						}
-					}
-				},
-				"listr-update-renderer": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz",
-					"integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==",
-					"dev": true,
-					"requires": {
-						"chalk": "^1.1.3",
-						"cli-truncate": "^0.2.1",
-						"elegant-spinner": "^1.0.1",
-						"figures": "^1.7.0",
-						"indent-string": "^3.0.0",
-						"log-symbols": "^1.0.2",
-						"log-update": "^2.3.0",
-						"strip-ansi": "^3.0.1"
-					},
-					"dependencies": {
-						"ansi-styles": {
-							"version": "2.2.1",
-							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-							"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-							"dev": true
-						},
-						"chalk": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-							"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-							"dev": true,
-							"requires": {
-								"ansi-styles": "^2.2.1",
-								"escape-string-regexp": "^1.0.2",
-								"has-ansi": "^2.0.0",
-								"strip-ansi": "^3.0.0",
-								"supports-color": "^2.0.0"
-							}
-						},
-						"log-symbols": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-							"integrity": "sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==",
-							"dev": true,
-							"requires": {
-								"chalk": "^1.0.0"
-							}
-						},
-						"supports-color": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-							"dev": true
-						}
-					}
-				},
-				"listr-verbose-renderer": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz",
-					"integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"cli-cursor": "^2.1.0",
-						"date-fns": "^1.27.2",
-						"figures": "^2.0.0"
-					},
-					"dependencies": {
-						"ansi-styles": {
-							"version": "3.2.1",
-							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-							"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-							"dev": true,
-							"requires": {
-								"color-convert": "^1.9.0"
-							}
-						},
-						"chalk": {
-							"version": "2.4.2",
-							"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-							"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-							"dev": true,
-							"requires": {
-								"ansi-styles": "^3.2.1",
-								"escape-string-regexp": "^1.0.5",
-								"supports-color": "^5.3.0"
-							}
-						},
-						"color-convert": {
-							"version": "1.9.3",
-							"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-							"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-							"dev": true,
-							"requires": {
-								"color-name": "1.1.3"
-							}
-						},
-						"color-name": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-							"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-							"dev": true
-						},
-						"figures": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-							"integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
-							"dev": true,
-							"requires": {
-								"escape-string-regexp": "^1.0.5"
-							}
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						}
-					}
-				},
-				"lodash": {
-					"version": "4.17.15",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-					"dev": true
-				},
-				"log-symbols": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-					"integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.2"
-					},
-					"dependencies": {
-						"ansi-styles": {
-							"version": "3.2.1",
-							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-							"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-							"dev": true,
-							"requires": {
-								"color-convert": "^1.9.0"
-							}
-						},
-						"chalk": {
-							"version": "2.4.2",
-							"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-							"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-							"dev": true,
-							"requires": {
-								"ansi-styles": "^3.2.1",
-								"escape-string-regexp": "^1.0.5",
-								"supports-color": "^5.3.0"
-							}
-						},
-						"color-convert": {
-							"version": "1.9.3",
-							"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-							"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-							"dev": true,
-							"requires": {
-								"color-name": "1.1.3"
-							}
-						},
-						"color-name": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-							"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-							"dev": true
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						}
-					}
-				},
-				"log-update": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
-					"integrity": "sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==",
-					"dev": true,
-					"requires": {
-						"ansi-escapes": "^3.0.0",
-						"cli-cursor": "^2.0.0",
-						"wrap-ansi": "^3.0.1"
-					}
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==",
-					"dev": true
-				},
-				"moment": {
-					"version": "2.24.0",
-					"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-					"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"p-finally": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
-					"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
-					"dev": true
-				},
-				"p-map": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-					"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"punycode": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-					"dev": true
-				},
-				"ramda": {
-					"version": "0.26.1",
-					"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz",
-					"integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==",
-					"dev": true
-				},
-				"request": {
-					"version": "2.88.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-					"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "~0.7.0",
-						"aws4": "^1.8.0",
-						"caseless": "~0.12.0",
-						"combined-stream": "~1.0.6",
-						"extend": "~3.0.2",
-						"forever-agent": "~0.6.1",
-						"form-data": "~2.3.2",
-						"har-validator": "~5.1.0",
-						"http-signature": "~1.2.0",
-						"is-typedarray": "~1.0.0",
-						"isstream": "~0.1.2",
-						"json-stringify-safe": "~5.0.1",
-						"mime-types": "~2.1.19",
-						"oauth-sign": "~0.9.0",
-						"performance-now": "^2.1.0",
-						"qs": "~6.5.2",
-						"safe-buffer": "^5.1.2",
-						"tough-cookie": "~2.4.3",
-						"tunnel-agent": "^0.6.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"rxjs": {
-					"version": "6.6.7",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-					"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-							"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"tough-cookie": {
-					"version": "2.4.3",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-					"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.24",
-						"punycode": "^1.4.1"
-					}
-				},
-				"untildify": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-					"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
-					"integrity": "sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-							"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"d3-array": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
-			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
-		},
-		"d3-dispatch": {
+		"node_modules/babel-code-frame/node_modules/supports-color": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz",
-			"integrity": "sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA=="
-		},
-		"d3-force": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz",
-			"integrity": "sha512-nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew==",
-			"requires": {
-				"d3-dispatch": "1 - 2",
-				"d3-quadtree": "1 - 2",
-				"d3-timer": "1 - 2"
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"d3-geo": {
-			"version": "1.12.1",
-			"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
-			"integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
-			"requires": {
-				"d3-array": "1"
+		"node_modules/babel-eslint": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
+			"integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+			"deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/parser": "^7.0.0",
+				"@babel/traverse": "^7.0.0",
+				"@babel/types": "^7.0.0",
+				"eslint-scope": "3.7.1",
+				"eslint-visitor-keys": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"peerDependencies": {
+				"eslint": ">= 4.12.1"
 			}
 		},
-		"d3-geo-projection": {
-			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-2.9.0.tgz",
-			"integrity": "sha512-ZULvK/zBn87of5rWAfFMc9mJOipeSo57O+BBitsKIXmU4rTVAnX1kSsJkE0R+TxY8pGNoM1nbyRRE7GYHhdOEQ==",
-			"requires": {
-				"commander": "2",
-				"d3-array": "1",
-				"d3-geo": "^1.12.0",
-				"resolve": "^1.1.10"
+		"node_modules/babel-loader": {
+			"version": "8.4.1",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz",
+			"integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"find-cache-dir": "^3.3.1",
+				"loader-utils": "^2.0.4",
+				"make-dir": "^3.1.0",
+				"schema-utils": "^2.6.5"
+			},
+			"engines": {
+				"node": ">= 8.9"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0",
+				"webpack": ">=2"
 			}
 		},
-		"d3-quadtree": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz",
-			"integrity": "sha512-b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw=="
-		},
-		"d3-timer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz",
-			"integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA=="
+		"node_modules/babel-plugin-dynamic-import-node": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+			"integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"object.assign": "^4.1.0"
+			}
 		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+		"node_modules/babel-plugin-module-resolver": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz",
+			"integrity": "sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==",
 			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"find-babel-config": "^1.1.0",
+				"glob": "^7.1.2",
+				"pkg-up": "^2.0.0",
+				"reselect": "^3.0.1",
+				"resolve": "^1.4.0"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
 			}
 		},
-		"data-urls": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-			"integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+		"node_modules/babel-plugin-polyfill-corejs2": {
+			"version": "0.4.11",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+			"integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
 			"dev": true,
-			"requires": {
-				"abab": "^2.0.0",
-				"whatwg-mimetype": "^2.2.0",
-				"whatwg-url": "^7.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/compat-data": "^7.22.6",
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"semver": "^6.3.1"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
-		"date-fns": {
-			"version": "1.30.1",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
-			"integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
-			"dev": true
-		},
-		"dayjs": {
-			"version": "1.11.5",
-			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz",
-			"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
-		},
-		"de-indent": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-			"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-			"dev": true
-		},
-		"debug": {
-			"version": "3.2.7",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-			"requires": {
-				"ms": "^2.1.1"
+		"node_modules/babel-plugin-polyfill-corejs3": {
+			"version": "0.10.6",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+			"integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"core-js-compat": "^3.38.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
-		"decache": {
-			"version": "4.6.1",
-			"resolved": "https://registry.npmjs.org/decache/-/decache-4.6.1.tgz",
-			"integrity": "sha512-ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q==",
+		"node_modules/babel-plugin-polyfill-regenerator": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+			"integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
 			"dev": true,
-			"requires": {
-				"callsite": "^1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-define-polyfill-provider": "^0.6.2"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-			"dev": true
-		},
-		"decimal-format": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/decimal-format/-/decimal-format-2.0.2.tgz",
-			"integrity": "sha512-a8LTpULkMAib4ny4CiP3ysFKcc4kcSz1O2jY7Cp35ncNKi2apTBZLTJ0Vl2Fl3VdsHpkZ20B/mRu/gcaiT+nNA=="
-		},
-		"decode-uri-component": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-			"integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
-			"dev": true
-		},
-		"decompress-response": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-			"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+		"node_modules/babel-runtime": {
+			"version": "6.26.0",
+			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+			"integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"mimic-response": "^2.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"core-js": "^2.4.0",
+				"regenerator-runtime": "^0.11.0"
 			}
 		},
-		"deep-eql": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-			"integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+		"node_modules/babel-runtime/node_modules/regenerator-runtime": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
 			"dev": true,
-			"requires": {
-				"type-detect": "^4.0.0"
-			}
+			"license": "MIT"
 		},
-		"deep-equal": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
-			"integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
-			"requires": {
-				"call-bind": "^1.0.0",
-				"es-get-iterator": "^1.1.1",
-				"get-intrinsic": "^1.0.1",
-				"is-arguments": "^1.0.4",
-				"is-date-object": "^1.0.2",
-				"is-regex": "^1.1.1",
-				"isarray": "^2.0.5",
-				"object-is": "^1.1.4",
-				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.2",
-				"regexp.prototype.flags": "^1.3.0",
-				"side-channel": "^1.0.3",
-				"which-boxed-primitive": "^1.0.1",
-				"which-collection": "^1.0.1",
-				"which-typed-array": "^1.1.2"
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"license": "MIT"
+		},
+		"node_modules/base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"license": "MIT",
+			"dependencies": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"deep-extend": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-			"dev": true,
-			"optional": true
+		"node_modules/base/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"license": "MIT",
+			"dependencies": {
+				"is-descriptor": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"deep-is": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true
+		"node_modules/base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"license": "MIT"
 		},
-		"deepmerge": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-			"integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
-			"dev": true
+		"node_modules/batch": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"default-gateway": {
-			"version": "5.0.5",
-			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz",
-			"integrity": "sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA==",
+		"node_modules/bcrypt-pbkdf": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+			"integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
 			"dev": true,
-			"requires": {
-				"execa": "^3.3.0"
-			},
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
-					"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"get-stream": "^5.0.0",
-						"human-signals": "^1.1.1",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.0",
-						"onetime": "^5.1.0",
-						"p-finally": "^2.0.0",
-						"signal-exit": "^3.0.2",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-					"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"p-finally": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
-					"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
+				"tweetnacl": "^0.14.3"
 			}
 		},
-		"defaults": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-			"integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+		"node_modules/bfj": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
+			"integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
 			"dev": true,
-			"requires": {
-				"clone": "^1.0.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"clone": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-					"integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-					"dev": true
-				}
+				"bluebird": "^3.5.5",
+				"check-types": "^8.0.3",
+				"hoopy": "^0.1.4",
+				"tryer": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
 			}
 		},
-		"define-properties": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-			"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-			"requires": {
-				"has-property-descriptors": "^1.0.0",
-				"object-keys": "^1.1.1"
+		"node_modules/big.js": {
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+			"license": "MIT",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"define-property": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-			"dev": true,
-			"requires": {
-				"is-descriptor": "^1.0.2",
-				"isobject": "^3.0.1"
-			},
-			"dependencies": {
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
+		"node_modules/binary-extensions": {
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+			"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+			"devOptional": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"del": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-			"integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-			"dev": true,
-			"requires": {
-				"@types/glob": "^7.1.1",
-				"globby": "^6.1.0",
-				"is-path-cwd": "^2.0.0",
-				"is-path-in-cwd": "^2.0.0",
-				"p-map": "^2.0.0",
-				"pify": "^4.0.1",
-				"rimraf": "^2.6.3"
-			},
+		"node_modules/bindings": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"globby": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-					"integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"glob": "^7.0.3",
-						"object-assign": "^4.0.1",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "2.3.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-							"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-							"dev": true
-						}
-					}
-				},
-				"p-map": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-					"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-					"dev": true
-				}
+				"file-uri-to-path": "1.0.0"
 			}
 		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-			"dev": true
-		},
-		"delegates": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-			"integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+		"node_modules/bl": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
 			"dev": true,
-			"optional": true
-		},
-		"depd": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-			"dev": true
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"buffer": "^5.5.0",
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.4.0"
+			}
 		},
-		"des.js": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+		"node_modules/bl/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
 			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"destroy": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-			"dev": true
-		},
-		"detect-libc": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-			"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+		"node_modules/blob-util": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
+			"integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
 			"dev": true,
-			"optional": true
-		},
-		"detect-node": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-			"dev": true
+			"license": "Apache-2.0"
 		},
-		"dfa": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz",
-			"integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q=="
+		"node_modules/bluebird": {
+			"version": "3.7.2",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+			"license": "MIT"
 		},
-		"diff": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-			"integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw=="
+		"node_modules/bn.js": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+			"integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+			"license": "MIT"
 		},
-		"diffie-hellman": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+		"node_modules/body-parser": {
+			"version": "1.20.3",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+			"integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
 			"dev": true,
-			"requires": {
-				"bn.js": "^4.1.0",
-				"miller-rabin": "^4.0.0",
-				"randombytes": "^2.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
+				"bytes": "3.1.2",
+				"content-type": "~1.0.5",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"destroy": "1.2.0",
+				"http-errors": "2.0.0",
+				"iconv-lite": "0.4.24",
+				"on-finished": "2.4.1",
+				"qs": "6.13.0",
+				"raw-body": "2.5.2",
+				"type-is": "~1.6.18",
+				"unpipe": "1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
 			}
 		},
-		"dir-glob": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-			"integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+		"node_modules/body-parser/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"dev": true,
-			"requires": {
-				"path-type": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
 			}
 		},
-		"dns-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-			"dev": true
-		},
-		"dns-packet": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-			"integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
+		"node_modules/body-parser/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"dev": true,
-			"requires": {
-				"ip": "^1.1.0",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"dns-txt": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-			"integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==",
-			"dev": true,
-			"requires": {
-				"buffer-indexof": "^1.0.0"
-			}
+			"license": "MIT"
 		},
-		"doctrine": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-			"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+		"node_modules/bonjour": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+			"integrity": "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"esutils": "^2.0.2"
+			"license": "MIT",
+			"dependencies": {
+				"array-flatten": "^2.1.0",
+				"deep-equal": "^1.0.1",
+				"dns-equal": "^1.0.0",
+				"dns-txt": "^2.0.2",
+				"multicast-dns": "^6.0.1",
+				"multicast-dns-service-types": "^1.1.0"
 			}
 		},
-		"dom-converter": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-			"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+		"node_modules/bonjour/node_modules/array-flatten": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
 			"dev": true,
-			"requires": {
-				"utila": "~0.4"
-			}
-		},
-		"dom-event-types": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/dom-event-types/-/dom-event-types-1.1.0.tgz",
-			"integrity": "sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==",
-			"dev": true
+			"license": "MIT"
 		},
-		"dom-serializer": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-			"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+		"node_modules/bonjour/node_modules/deep-equal": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
+			"integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
 			"dev": true,
-			"requires": {
-				"domelementtype": "^2.0.1",
-				"entities": "^2.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				}
+				"is-arguments": "^1.1.1",
+				"is-date-object": "^1.0.5",
+				"is-regex": "^1.1.4",
+				"object-is": "^1.1.5",
+				"object-keys": "^1.1.1",
+				"regexp.prototype.flags": "^1.5.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"domain-browser": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-			"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-			"dev": true
-		},
-		"domelementtype": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-			"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-			"dev": true
-		},
-		"domexception": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-			"integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+		"node_modules/boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
 			"dev": true,
-			"requires": {
-				"webidl-conversions": "^4.0.2"
+			"license": "ISC"
+		},
+		"node_modules/bootstrap": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+			"integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"domhandler": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^2.2.0"
-			},
+		"node_modules/brace": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
+			"integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==",
+			"license": "MIT"
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"license": "MIT",
 			"dependencies": {
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				}
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
 			}
 		},
-		"domutils": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-			"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-			"dev": true,
-			"requires": {
-				"dom-serializer": "0",
-				"domelementtype": "1"
+		"node_modules/braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"license": "MIT",
+			"dependencies": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"dot-object": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/dot-object/-/dot-object-1.9.0.tgz",
-			"integrity": "sha512-7MPN6y7XhAO4vM4eguj5+5HNKLjJYfkVG1ZR1Aput4Q4TR6SYeSjhpVQ77IzJHoSHffKbDxBC+48aCiiRurDPw==",
-			"dev": true,
-			"requires": {
-				"commander": "^2.20.0",
-				"glob": "^7.1.4"
+		"node_modules/braces/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"license": "MIT",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"dot-prop": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-			"dev": true,
-			"requires": {
-				"is-obj": "^2.0.0"
+		"node_modules/braces/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"dotenv": {
-			"version": "8.6.0",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-			"integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
-			"dev": true
+		"node_modules/brorand": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+			"integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+			"license": "MIT"
 		},
-		"dotenv-expand": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-			"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
-			"dev": true
+		"node_modules/brotli": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz",
+			"integrity": "sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==",
+			"license": "MIT",
+			"dependencies": {
+				"base64-js": "^1.1.2"
+			}
 		},
-		"drag-tracker": {
+		"node_modules/browser-process-hrtime": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/drag-tracker/-/drag-tracker-1.0.0.tgz",
-			"integrity": "sha512-BSGDl37YXpW49dLMRfiDExxzD3yPOpLEBGx05Wed3z2sk2+Qd5dFvHCSVFTPsGTeltGBtkRB4qhLhSKv6tvBKw=="
-		},
-		"duplexer": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+			"dev": true,
+			"license": "BSD-2-Clause"
 		},
-		"duplexify": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+		"node_modules/browser-stdout": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
 			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.0.0",
+			"license": "ISC"
+		},
+		"node_modules/browserify-aes": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+			"license": "MIT",
+			"dependencies": {
+				"buffer-xor": "^1.0.3",
+				"cipher-base": "^1.0.0",
+				"create-hash": "^1.1.0",
+				"evp_bytestokey": "^1.0.3",
 				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0",
-				"stream-shift": "^1.0.0"
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"easy-stack": {
+		"node_modules/browserify-cipher": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz",
-			"integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==",
-			"dev": true
-		},
-		"ecc-jsbn": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-			"integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-			"dev": true,
-			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
+			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+			"license": "MIT",
+			"dependencies": {
+				"browserify-aes": "^1.0.4",
+				"browserify-des": "^1.0.0",
+				"evp_bytestokey": "^1.0.0"
 			}
 		},
-		"editorconfig": {
-			"version": "0.15.3",
-			"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
-			"integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
-			"dev": true,
-			"requires": {
-				"commander": "^2.19.0",
-				"lru-cache": "^4.1.5",
-				"semver": "^5.6.0",
-				"sigmund": "^1.0.1"
-			},
+		"node_modules/browserify-des": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+			"license": "MIT",
 			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				}
+				"cipher-base": "^1.0.1",
+				"des.js": "^1.0.0",
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.1.2"
 			}
 		},
-		"ee-first": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-			"dev": true
-		},
-		"ejs": {
-			"version": "2.7.4",
-			"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-			"integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-			"dev": true
-		},
-		"electron-to-chromium": {
-			"version": "1.4.283",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.283.tgz",
-			"integrity": "sha512-g6RQ9zCOV+U5QVHW9OpFR7rdk/V7xfopNXnyAamdpFgCHgZ1sjI8VuR1+zG2YG/TZk+tQ8mpNkug4P8FU0fuOA==",
-			"dev": true
-		},
-		"elegant-spinner": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
-			"integrity": "sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ==",
-			"dev": true
+		"node_modules/browserify-rsa": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+			"license": "MIT",
+			"dependencies": {
+				"bn.js": "^5.0.0",
+				"randombytes": "^2.0.1"
+			}
 		},
-		"elliptic": {
-			"version": "6.5.4",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^4.11.9",
-				"brorand": "^1.1.0",
-				"hash.js": "^1.0.0",
-				"hmac-drbg": "^1.0.1",
+		"node_modules/browserify-sign": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz",
+			"integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
+			"license": "ISC",
+			"dependencies": {
+				"bn.js": "^5.2.1",
+				"browserify-rsa": "^4.1.0",
+				"create-hash": "^1.2.0",
+				"create-hmac": "^1.1.7",
+				"elliptic": "^6.5.5",
+				"hash-base": "~3.0",
 				"inherits": "^2.0.4",
-				"minimalistic-assert": "^1.0.1",
-				"minimalistic-crypto-utils": "^1.0.1"
+				"parse-asn1": "^5.1.7",
+				"readable-stream": "^2.3.8",
+				"safe-buffer": "^5.2.1"
 			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">= 0.12"
 			}
 		},
-		"emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"emojis-list": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
+		"node_modules/browserify-zlib": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+			"license": "MIT",
+			"dependencies": {
+				"pako": "~1.0.5"
+			}
 		},
-		"encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-			"dev": true
+		"node_modules/browserify-zlib/node_modules/pako": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+			"license": "(MIT AND Zlib)"
 		},
-		"end-of-stream": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+		"node_modules/browserslist": {
+			"version": "4.23.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+			"integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
 			"dev": true,
-			"requires": {
-				"once": "^1.4.0"
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001646",
+				"electron-to-chromium": "^1.5.4",
+				"node-releases": "^2.0.18",
+				"update-browserslist-db": "^1.1.0"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
 			}
 		},
-		"enhanced-resolve": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-			"integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
+		"node_modules/buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
 			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"memory-fs": "^0.5.0",
-				"tapable": "^1.0.0"
-			},
-			"dependencies": {
-				"memory-fs": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-					"integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
 				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
 			}
 		},
-		"entities": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-			"dev": true
-		},
-		"errno": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-			"integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+		"node_modules/buffer-crc32": {
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+			"integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
 			"dev": true,
-			"requires": {
-				"prr": "~1.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+		"node_modules/buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"license": "MIT"
+		},
+		"node_modules/buffer-indexof": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+			"integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
 			"dev": true,
-			"requires": {
-				"is-arrayish": "^0.2.1"
-			}
+			"license": "MIT"
 		},
-		"error-stack-parser": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
-			"integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+		"node_modules/buffer-json": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz",
+			"integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==",
 			"dev": true,
-			"requires": {
-				"stackframe": "^1.3.4"
-			}
+			"license": "MIT"
 		},
-		"es-abstract": {
-			"version": "1.20.4",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-			"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"es-to-primitive": "^1.2.1",
-				"function-bind": "^1.1.1",
-				"function.prototype.name": "^1.1.5",
-				"get-intrinsic": "^1.1.3",
-				"get-symbol-description": "^1.0.0",
-				"has": "^1.0.3",
-				"has-property-descriptors": "^1.0.0",
-				"has-symbols": "^1.0.3",
-				"internal-slot": "^1.0.3",
-				"is-callable": "^1.2.7",
-				"is-negative-zero": "^2.0.2",
-				"is-regex": "^1.1.4",
-				"is-shared-array-buffer": "^1.0.2",
-				"is-string": "^1.0.7",
-				"is-weakref": "^1.0.2",
-				"object-inspect": "^1.12.2",
-				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.4",
-				"regexp.prototype.flags": "^1.4.3",
-				"safe-regex-test": "^1.0.0",
-				"string.prototype.trimend": "^1.0.5",
-				"string.prototype.trimstart": "^1.0.5",
-				"unbox-primitive": "^1.0.2"
-			}
+		"node_modules/buffer-xor": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+			"integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+			"license": "MIT"
 		},
-		"es-array-method-boxes-properly": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-			"integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-			"dev": true
+		"node_modules/builtin-status-codes": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+			"integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
+			"license": "MIT"
 		},
-		"es-get-iterator": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-			"integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.0",
-				"has-symbols": "^1.0.1",
-				"is-arguments": "^1.1.0",
-				"is-map": "^2.0.2",
-				"is-set": "^2.0.2",
-				"is-string": "^1.0.5",
-				"isarray": "^2.0.5"
+		"node_modules/bytes": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"es-to-primitive": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-			"requires": {
-				"is-callable": "^1.1.4",
-				"is-date-object": "^1.0.1",
-				"is-symbol": "^1.0.2"
+		"node_modules/cacache": {
+			"version": "12.0.4",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+			"integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+			"license": "ISC",
+			"dependencies": {
+				"bluebird": "^3.5.5",
+				"chownr": "^1.1.1",
+				"figgy-pudding": "^3.5.1",
+				"glob": "^7.1.4",
+				"graceful-fs": "^4.1.15",
+				"infer-owner": "^1.0.3",
+				"lru-cache": "^5.1.1",
+				"mississippi": "^3.0.0",
+				"mkdirp": "^0.5.1",
+				"move-concurrently": "^1.0.1",
+				"promise-inflight": "^1.0.1",
+				"rimraf": "^2.6.3",
+				"ssri": "^6.0.1",
+				"unique-filename": "^1.1.1",
+				"y18n": "^4.0.0"
 			}
 		},
-		"es6-object-assign": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-			"integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw=="
-		},
-		"escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-			"dev": true
-		},
-		"escape-html": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-			"dev": true
-		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-			"dev": true
+		"node_modules/cacache/node_modules/ssri": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+			"integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+			"license": "ISC",
+			"dependencies": {
+				"figgy-pudding": "^3.5.1"
+			}
 		},
-		"escodegen": {
-			"version": "1.14.3",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-			"integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-			"dev": true,
-			"requires": {
-				"esprima": "^4.0.1",
-				"estraverse": "^4.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1",
-				"source-map": "~0.6.1"
+		"node_modules/cache-base": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+			"license": "MIT",
+			"dependencies": {
+				"collection-visit": "^1.0.0",
+				"component-emitter": "^1.2.1",
+				"get-value": "^2.0.6",
+				"has-value": "^1.0.0",
+				"isobject": "^3.0.1",
+				"set-value": "^2.0.0",
+				"to-object-path": "^0.3.0",
+				"union-value": "^1.0.0",
+				"unset-value": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"eslint": {
-			"version": "5.16.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
-			"integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
+		"node_modules/cache-loader": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz",
+			"integrity": "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==",
 			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"ajv": "^6.9.1",
-				"chalk": "^2.1.0",
-				"cross-spawn": "^6.0.5",
-				"debug": "^4.0.1",
-				"doctrine": "^3.0.0",
-				"eslint-scope": "^4.0.3",
-				"eslint-utils": "^1.3.1",
-				"eslint-visitor-keys": "^1.0.0",
-				"espree": "^5.0.1",
-				"esquery": "^1.0.1",
-				"esutils": "^2.0.2",
-				"file-entry-cache": "^5.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob": "^7.1.2",
-				"globals": "^11.7.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"inquirer": "^6.2.2",
-				"js-yaml": "^3.13.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.3.0",
-				"lodash": "^4.17.11",
-				"minimatch": "^3.0.4",
+			"license": "MIT",
+			"dependencies": {
+				"buffer-json": "^2.0.0",
+				"find-cache-dir": "^3.0.0",
+				"loader-utils": "^1.2.3",
 				"mkdirp": "^0.5.1",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.8.2",
-				"path-is-inside": "^1.0.2",
-				"progress": "^2.0.0",
-				"regexpp": "^2.0.1",
-				"semver": "^5.5.1",
-				"strip-ansi": "^4.0.0",
-				"strip-json-comments": "^2.0.1",
-				"table": "^5.2.3",
-				"text-table": "^0.2.0"
+				"neo-async": "^2.6.1",
+				"schema-utils": "^2.0.0"
 			},
-			"dependencies": {
-				"acorn-jsx": {
-					"version": "5.3.2",
-					"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-					"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-					"dev": true
-				},
-				"ansi-escapes": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-					"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"chardet": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-					"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"doctrine": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-					"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-					"dev": true,
-					"requires": {
-						"esutils": "^2.0.2"
-					}
-				},
-				"emoji-regex": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-					"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-					"dev": true
-				},
-				"espree": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
-					"integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
-					"dev": true,
-					"requires": {
-						"acorn": "^6.0.7",
-						"acorn-jsx": "^5.0.0",
-						"eslint-visitor-keys": "^1.0.0"
-					}
-				},
-				"external-editor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-					"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-					"dev": true,
-					"requires": {
-						"chardet": "^0.7.0",
-						"iconv-lite": "^0.4.24",
-						"tmp": "^0.0.33"
-					}
-				},
-				"figures": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-					"integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"file-entry-cache": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-					"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-					"dev": true,
-					"requires": {
-						"flat-cache": "^2.0.1"
-					}
-				},
-				"flat-cache": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-					"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-					"dev": true,
-					"requires": {
-						"flatted": "^2.0.0",
-						"rimraf": "2.6.3",
-						"write": "1.0.3"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"ignore": {
-					"version": "4.0.6",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-					"dev": true
-				},
-				"import-fresh": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-					"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-					"dev": true,
-					"requires": {
-						"parent-module": "^1.0.0",
-						"resolve-from": "^4.0.0"
-					}
-				},
-				"inquirer": {
-					"version": "6.5.2",
-					"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-					"integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
-					"dev": true,
-					"requires": {
-						"ansi-escapes": "^3.2.0",
-						"chalk": "^2.4.2",
-						"cli-cursor": "^2.1.0",
-						"cli-width": "^2.0.0",
-						"external-editor": "^3.0.3",
-						"figures": "^2.0.0",
-						"lodash": "^4.17.12",
-						"mute-stream": "0.0.7",
-						"run-async": "^2.2.0",
-						"rxjs": "^6.4.0",
-						"string-width": "^2.1.0",
-						"strip-ansi": "^5.1.0",
-						"through": "^2.3.6"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-							"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "5.2.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-							"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"regexpp": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-					"integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-					"dev": true
-				},
-				"resolve-from": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-					"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-					"dev": true
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"rxjs": {
-					"version": "6.6.7",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-					"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				},
-				"slice-ansi": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-					"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"astral-regex": "^1.0.0",
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				},
-				"table": {
-					"version": "5.4.6",
-					"resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-					"integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.10.2",
-						"lodash": "^4.17.14",
-						"slice-ansi": "^2.1.0",
-						"string-width": "^3.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-							"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-							"dev": true
-						},
-						"string-width": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-							"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-							"dev": true,
-							"requires": {
-								"emoji-regex": "^7.0.1",
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^5.1.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "5.2.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-							"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"tmp": {
-					"version": "0.0.33",
-					"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-					"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-					"dev": true,
-					"requires": {
-						"os-tmpdir": "~1.0.2"
-					}
-				},
-				"write": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-					"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-					"dev": true,
-					"requires": {
-						"mkdirp": "^0.5.1"
-					}
-				}
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0"
 			}
 		},
-		"eslint-loader": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz",
-			"integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==",
+		"node_modules/cache-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
 			"dev": true,
-			"requires": {
-				"loader-fs-cache": "^1.0.0",
-				"loader-utils": "^1.0.2",
-				"object-assign": "^4.0.1",
-				"object-hash": "^1.1.4",
-				"rimraf": "^2.6.1"
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"eslint-plugin-cypress": {
-			"version": "2.12.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz",
-			"integrity": "sha512-c2W/uPADl5kospNDihgiLc7n87t5XhUbFDoTl6CfVkmG+kDAb5Ux10V9PoLPu9N+r7znpc+iQlcmAqT1A/89HA==",
+		"node_modules/cache-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
 			"dev": true,
-			"requires": {
-				"globals": "^11.12.0"
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"eslint-plugin-vue": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0.tgz",
-			"integrity": "sha512-mSv2Ebz3RaPP+XJO/mu7F+SdR9lrMyGISSExnarLFqqf3pF5wTmwWNrhHW1o9zKzKI811UVTIIkWJJvgO6SsUQ==",
+		"node_modules/cachedir": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
+			"integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
 			"dev": true,
-			"requires": {
-				"vue-eslint-parser": "^4.0.2"
-			},
-			"dependencies": {
-				"acorn-jsx": {
-					"version": "5.3.2",
-					"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-					"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"espree": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz",
-					"integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==",
-					"dev": true,
-					"requires": {
-						"acorn": "^6.0.2",
-						"acorn-jsx": "^5.0.0",
-						"eslint-visitor-keys": "^1.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"vue-eslint-parser": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-4.0.3.tgz",
-					"integrity": "sha512-AUeQsYdO6+7QXCems+WvGlrXd37PHv/zcRQSQdY1xdOMwdFAPEnMBsv7zPvk0TPGulXkK/5p/ITgrjiYB7k3ag==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"eslint-scope": "^4.0.0",
-						"eslint-visitor-keys": "^1.0.0",
-						"espree": "^4.1.0",
-						"esquery": "^1.0.1",
-						"lodash": "^4.17.11"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"eslint-scope": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+		"node_modules/call-bind": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+			"license": "MIT",
+			"dependencies": {
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"set-function-length": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/call-me-maybe": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
+			"integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
 			"dev": true,
-			"requires": {
-				"esrecurse": "^4.1.0",
-				"estraverse": "^4.1.1"
+			"license": "MIT"
+		},
+		"node_modules/caller-callsite": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+			"integrity": "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"callsites": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"eslint-utils": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-			"integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+		"node_modules/caller-path": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+			"integrity": "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==",
 			"dev": true,
-			"requires": {
-				"eslint-visitor-keys": "^1.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"caller-callsite": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"eslint-visitor-keys": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-			"dev": true
+		"node_modules/callsite": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+			"integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
 		},
-		"esm": {
-			"version": "3.2.25",
-			"resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
-			"integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==",
-			"dev": true
+		"node_modules/callsites": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+			"integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"espree": {
-			"version": "3.5.4",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-			"integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+		"node_modules/camel-case": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+			"integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"acorn": "^5.5.0",
-				"acorn-jsx": "^3.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"acorn": {
-					"version": "5.7.4",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-					"integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-					"dev": true,
-					"optional": true
-				}
+				"no-case": "^2.2.0",
+				"upper-case": "^1.1.1"
 			}
 		},
-		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true
+		"node_modules/camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+		"node_modules/caniuse-api": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
 			"dev": true,
-			"requires": {
-				"estraverse": "^5.1.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				}
+				"browserslist": "^4.0.0",
+				"caniuse-lite": "^1.0.0",
+				"lodash.memoize": "^4.1.2",
+				"lodash.uniq": "^4.5.0"
 			}
 		},
-		"esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001660",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
+			"integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
 			"dev": true,
-			"requires": {
-				"estraverse": "^5.2.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
 				}
+			],
+			"license": "CC-BY-4.0"
+		},
+		"node_modules/canvg": {
+			"version": "3.0.10",
+			"resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
+			"integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/runtime": "^7.12.5",
+				"@types/raf": "^3.4.0",
+				"core-js": "^3.8.3",
+				"raf": "^3.4.1",
+				"regenerator-runtime": "^0.13.7",
+				"rgbcolor": "^1.0.1",
+				"stackblur-canvas": "^2.0.0",
+				"svg-pathdata": "^6.0.3"
+			},
+			"engines": {
+				"node": ">=10.0.0"
 			}
 		},
-		"estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"dev": true
+		"node_modules/canvg/node_modules/core-js": {
+			"version": "3.38.1",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
+			"integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
+			"hasInstallScript": true,
+			"license": "MIT",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/core-js"
+			}
 		},
-		"esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true
+		"node_modules/canvg/node_modules/regenerator-runtime": {
+			"version": "0.13.11",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+			"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+			"license": "MIT"
 		},
-		"etag": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-			"dev": true
+		"node_modules/case-sensitive-paths-webpack-plugin": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
+			"integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"event-pubsub": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
-			"integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==",
-			"dev": true
+		"node_modules/caseless": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+			"integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+			"dev": true,
+			"license": "Apache-2.0"
+		},
+		"node_modules/cfb": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
+			"integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"adler-32": "~1.3.0",
+				"crc-32": "~1.2.0"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/cfb/node_modules/adler-32": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+			"integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
+			}
 		},
-		"eventemitter2": {
+		"node_modules/chai": {
 			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-4.1.2.tgz",
-			"integrity": "sha512-erx0niBaTi8B7ywjGAcg8ilGNRl/xs/o4MO2ZMpRlpZ62mYzjGTBlOpxxRIrPQqBs9mbXkEux6aR+Sc5vQ/wUw==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
+			"integrity": "sha512-YTHf80rJ8M5/cJoFKEV1y3PnexbGs0vSHjouRRU8gLM05Nc3Mqq9zor/P4SCqB/sgvKRLvya7wHLC1XQ9pTjgQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"assertion-error": "^1.0.1",
+				"check-error": "^1.0.1",
+				"deep-eql": "^3.0.0",
+				"get-func-name": "^2.0.0",
+				"pathval": "^1.0.0",
+				"type-detect": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"eventemitter3": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-			"dev": true
+		"node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"events": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-			"dev": true
+		"node_modules/chardet": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+			"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"eventsource": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz",
-			"integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA=="
+		"node_modules/charenc": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+			"integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": "*"
+			}
 		},
-		"evp_bytestokey": {
+		"node_modules/check-error": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+			"integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
 			"dev": true,
-			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
+			"license": "MIT",
+			"dependencies": {
+				"get-func-name": "^2.0.2"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+		"node_modules/check-more-types": {
+			"version": "2.24.0",
+			"resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
+			"integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
 			"dev": true,
-			"requires": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"executable": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-			"integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+		"node_modules/check-types": {
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
+			"integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
 			"dev": true,
-			"requires": {
-				"pify": "^2.2.0"
-			},
+			"license": "MIT"
+		},
+		"node_modules/chokidar": {
+			"version": "2.1.8",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+			"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+			"devOptional": true,
+			"license": "MIT",
 			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-					"dev": true
-				}
+				"anymatch": "^2.0.0",
+				"async-each": "^1.0.1",
+				"braces": "^2.3.2",
+				"glob-parent": "^3.1.0",
+				"inherits": "^2.0.3",
+				"is-binary-path": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"normalize-path": "^3.0.0",
+				"path-is-absolute": "^1.0.0",
+				"readdirp": "^2.2.1",
+				"upath": "^1.1.1"
+			},
+			"optionalDependencies": {
+				"fsevents": "^1.2.7"
 			}
 		},
-		"exit-hook": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-			"integrity": "sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==",
-			"dev": true
+		"node_modules/chownr": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+			"license": "ISC"
 		},
-		"exit-on-epipe": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
-			"integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
+		"node_modules/chrome-trace-event": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0"
+			}
 		},
-		"expand-brackets": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-			"integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+		"node_modules/ci-info": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
 			"dev": true,
-			"requires": {
-				"debug": "^2.3.3",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"posix-character-classes": "^0.1.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
 				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"expand-template": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+		"node_modules/cipher-base": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"node_modules/circular-json": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+			"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+			"deprecated": "CircularJSON is in maintenance only, flatted is its successor.",
 			"dev": true,
+			"license": "MIT",
 			"optional": true
 		},
-		"express": {
-			"version": "4.18.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-			"dev": true,
-			"requires": {
-				"accepts": "~1.3.8",
-				"array-flatten": "1.1.1",
-				"body-parser": "1.20.1",
-				"content-disposition": "0.5.4",
-				"content-type": "~1.0.4",
-				"cookie": "0.5.0",
-				"cookie-signature": "1.0.6",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"finalhandler": "1.2.0",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.1",
-				"methods": "~1.1.2",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.7",
-				"proxy-addr": "~2.0.7",
-				"qs": "6.11.0",
-				"range-parser": "~1.2.1",
-				"safe-buffer": "5.2.1",
-				"send": "0.18.0",
-				"serve-static": "1.15.0",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"type-is": "~1.6.18",
-				"utils-merge": "1.0.1",
-				"vary": "~1.1.2"
+		"node_modules/class-utils": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+			"license": "MIT",
+			"dependencies": {
+				"arr-union": "^3.1.0",
+				"define-property": "^0.2.5",
+				"isobject": "^3.0.0",
+				"static-extend": "^0.1.1"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/class-utils/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"path-to-regexp": {
-					"version": "0.1.7",
-					"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-					"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.11.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-					"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-					"dev": true,
-					"requires": {
-						"side-channel": "^1.0.4"
-					}
-				}
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
+		"node_modules/class-utils/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"license": "MIT",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+		"node_modules/clean-css": {
+			"version": "4.2.4",
+			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+			"integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
 			"dev": true,
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
+				"source-map": "~0.6.0"
+			},
+			"engines": {
+				"node": ">= 4.0"
 			}
 		},
-		"external-editor": {
+		"node_modules/clean-stack": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-			"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"chardet": "^0.4.0",
-				"iconv-lite": "^0.4.17",
-				"tmp": "^0.0.33"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"tmp": {
-					"version": "0.0.33",
-					"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-					"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"os-tmpdir": "~1.0.2"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"extglob": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+		"node_modules/cli-cursor": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+			"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
 			"dev": true,
-			"requires": {
-				"array-unique": "^0.3.2",
-				"define-property": "^1.0.0",
-				"expand-brackets": "^2.1.4",
-				"extend-shallow": "^2.0.1",
-				"fragment-cache": "^0.2.1",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
+				"restore-cursor": "^3.1.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"extract-zip": {
-			"version": "1.6.7",
-			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
-			"integrity": "sha512-NWFb/0zxv3qh7f6hEy+F+Y+jPAqt1bfT52GR8Vi7sEFg2fBZlG/aM6ZrSGPUscP0I4JRhtgVG6I17HOuD7GESw==",
+		"node_modules/cli-highlight": {
+			"version": "2.1.11",
+			"resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
+			"integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
 			"dev": true,
-			"requires": {
-				"concat-stream": "1.6.2",
-				"debug": "2.6.9",
-				"mkdirp": "0.5.1",
-				"yauzl": "2.4.1"
-			},
+			"license": "ISC",
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"yauzl": {
-					"version": "2.4.1",
-					"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-					"integrity": "sha512-TXNR2Feu/p/8k5YRy4z45wCUhoncIrZywmRd+xW0IvB3lWTAM7F6wVbeJvRjO0dplQ8oqmJEj/TpJuULBV/hbw==",
-					"dev": true,
-					"requires": {
-						"fd-slicer": "~1.0.1"
-					}
-				}
+				"chalk": "^4.0.0",
+				"highlight.js": "^10.7.1",
+				"mz": "^2.4.0",
+				"parse5": "^5.1.1",
+				"parse5-htmlparser2-tree-adapter": "^6.0.0",
+				"yargs": "^16.0.0"
+			},
+			"bin": {
+				"highlight": "bin/highlight"
+			},
+			"engines": {
+				"node": ">=8.0.0",
+				"npm": ">=5.0.0"
 			}
 		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-			"dev": true
-		},
-		"fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-		},
-		"fast-glob": {
-			"version": "2.2.7",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-			"integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+		"node_modules/cli-highlight/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"@mrmlnc/readdir-enhanced": "^2.2.1",
-				"@nodelib/fs.stat": "^1.1.2",
-				"glob-parent": "^3.1.0",
-				"is-glob": "^4.0.0",
-				"merge2": "^1.2.3",
-				"micromatch": "^3.1.10"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-							"dev": true,
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true
-		},
-		"faye-websocket": {
-			"version": "0.11.4",
-			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-			"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-			"requires": {
-				"websocket-driver": ">=0.5.1"
+		"node_modules/cli-highlight/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"fd-slicer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-			"integrity": "sha512-MX1ZLPIuKED51hrI4++K+1B0VX87Cs4EkybD2q12Ysuf5p4vkmHqMvQJRlDwROqFr4D2Pzyit5wGQxf30grIcw==",
+		"node_modules/cli-highlight/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"pend": "~1.2.0"
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"figgy-pudding": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-			"integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-			"dev": true
-		},
-		"figures": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-			"integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
+		"node_modules/cli-highlight/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^1.0.5",
-				"object-assign": "^4.1.0"
-			}
+			"license": "MIT"
 		},
-		"file-entry-cache": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-			"integrity": "sha512-uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w==",
+		"node_modules/cli-highlight/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"flat-cache": "^1.2.1",
-				"object-assign": "^4.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"file-loader": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
-			"integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
+		"node_modules/cli-highlight/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"loader-utils": "^1.2.3",
-				"schema-utils": "^2.5.0"
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"file-uri-to-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+		"node_modules/cli-spinners": {
+			"version": "2.9.2",
+			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+			"integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
 			"dev": true,
-			"optional": true
-		},
-		"filesize": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-			"integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
-			"dev": true
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"fill-range": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-			"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+		"node_modules/cli-table3": {
+			"version": "0.6.5",
+			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
+			"integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
 			"dev": true,
-			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+				"string-width": "^4.2.0"
+			},
+			"engines": {
+				"node": "10.* || >= 12.*"
+			},
+			"optionalDependencies": {
+				"@colors/colors": "1.5.0"
 			}
 		},
-		"finalhandler": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+		"node_modules/cli-truncate": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+			"integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
 			"dev": true,
-			"requires": {
-				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"statuses": "2.0.1",
-				"unpipe": "~1.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				}
+				"slice-ansi": "^3.0.0",
+				"string-width": "^4.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"find-babel-config": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz",
-			"integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==",
+		"node_modules/cli-width": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
 			"dev": true,
-			"requires": {
-				"json5": "^0.5.1",
-				"path-exists": "^3.0.0"
-			},
+			"license": "ISC"
+		},
+		"node_modules/clipboardy": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
+			"integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"json5": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
-					"dev": true
-				}
+				"arch": "^2.1.1",
+				"execa": "^1.0.0",
+				"is-wsl": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+		"node_modules/cliui": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+			"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
 			"dev": true,
-			"requires": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
+			"license": "ISC",
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^6.2.0"
 			}
 		},
-		"find-up": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-			"integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
-			"dev": true,
-			"requires": {
-				"locate-path": "^2.0.0"
+		"node_modules/clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"flat": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-			"dev": true
-		},
-		"flat-cache": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-			"integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+		"node_modules/clone-deep": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"circular-json": "^0.3.1",
-				"graceful-fs": "^4.1.2",
-				"rimraf": "~2.6.2",
-				"write": "^0.2.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
+				"is-plain-object": "^2.0.4",
+				"kind-of": "^6.0.2",
+				"shallow-clone": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"flatted": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-			"integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-			"dev": true
+		"node_modules/co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+			"license": "MIT",
+			"engines": {
+				"iojs": ">= 1.0.0",
+				"node": ">= 0.12.0"
+			}
 		},
-		"flush-write-stream": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+		"node_modules/coa": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+			"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
 			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.3.6"
+			"license": "MIT",
+			"dependencies": {
+				"@types/q": "^1.5.1",
+				"chalk": "^2.4.1",
+				"q": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 4.0"
 			}
 		},
-		"follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
-		},
-		"fontkit": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.9.0.tgz",
-			"integrity": "sha512-HkW/8Lrk8jl18kzQHvAw9aTHe1cqsyx5sDnxncx652+CIfhawokEPkeM3BoIC+z/Xv7a0yMr0f3pRRwhGH455g==",
-			"requires": {
-				"@swc/helpers": "^0.3.13",
-				"brotli": "^1.3.2",
-				"clone": "^2.1.2",
-				"deep-equal": "^2.0.5",
-				"dfa": "^1.2.0",
-				"restructure": "^2.0.1",
-				"tiny-inflate": "^1.0.3",
-				"unicode-properties": "^1.3.1",
-				"unicode-trie": "^2.0.0"
+		"node_modules/code-point-at": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+			"integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"for-each": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-			"requires": {
-				"is-callable": "^1.1.3"
+		"node_modules/codepage": {
+			"version": "1.14.0",
+			"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
+			"integrity": "sha512-iz3zJLhlrg37/gYRWgEPkaFTtzmnEv1h+r7NgZum2lFElYQPi0/5bnmuDfODHxfp0INEfnRqyfyeIJDbb7ahRw==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"commander": "~2.14.1",
+				"exit-on-epipe": "~1.0.1"
+			},
+			"bin": {
+				"codepage": "bin/codepage.njs"
+			},
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-			"dev": true
+		"node_modules/codepage/node_modules/commander": {
+			"version": "2.14.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
+			"integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
+			"license": "MIT"
 		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-			"dev": true
+		"node_modules/collection-visit": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+			"integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+			"license": "MIT",
+			"dependencies": {
+				"map-visit": "^1.0.0",
+				"object-visit": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"form-data": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+		"node_modules/color": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+			"integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
 			"dev": true,
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^1.9.3",
+				"color-string": "^1.6.0"
 			}
 		},
-		"forwarded": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-			"dev": true
-		},
-		"frac": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
-			"integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
-		},
-		"fragment-cache": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-			"integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+		"node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
 			"dev": true,
-			"requires": {
-				"map-cache": "^0.2.2"
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "1.1.3"
 			}
 		},
-		"fresh": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-			"dev": true
+		"node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"from2": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-			"integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
+		"node_modules/color-string": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+			"integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
 			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "^1.0.0",
+				"simple-swizzle": "^0.2.2"
 			}
 		},
-		"fs-constants": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+		"node_modules/colorette": {
+			"version": "2.0.20",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
 			"dev": true,
-			"optional": true
+			"license": "MIT"
 		},
-		"fs-extra": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-			"integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+		"node_modules/colors": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+			"integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
 			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.1.90"
 			}
 		},
-		"fs-minipass": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-			"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
 			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"fs-write-stream-atomic": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-			"integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==",
+		"node_modules/commander": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+			"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
 			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"iferr": "^0.1.5",
-				"imurmurhash": "^0.1.4",
-				"readable-stream": "1 || 2"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-			"dev": true
-		},
-		"fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+		"node_modules/common-tags": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
+			"integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
 			"dev": true,
-			"optional": true
-		},
-		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-		},
-		"function.prototype.name": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-			"integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.0",
-				"functions-have-names": "^1.2.2"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"functional-red-black-tree": {
+		"node_modules/commondir": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+			"license": "MIT"
 		},
-		"functions-have-names": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+		"node_modules/component-emitter": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+			"integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"gauge": {
-			"version": "2.7.4",
-			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-			"integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
+		"node_modules/compressible": {
+			"version": "2.0.18",
+			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"aproba": "^1.0.3",
-				"console-control-strings": "^1.0.0",
-				"has-unicode": "^2.0.0",
-				"object-assign": "^4.1.0",
-				"signal-exit": "^3.0.0",
-				"string-width": "^1.0.1",
-				"strip-ansi": "^3.0.1",
-				"wide-align": "^1.1.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true,
-					"optional": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				}
+				"mime-db": ">= 1.43.0 < 2"
+			},
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-			"dev": true
-		},
-		"get-func-name": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-			"integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
-			"dev": true
-		},
-		"get-intrinsic": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-			"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.3"
+		"node_modules/compression": {
+			"version": "1.7.4",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"accepts": "~1.3.5",
+				"bytes": "3.0.0",
+				"compressible": "~2.0.16",
+				"debug": "2.6.9",
+				"on-headers": "~1.0.2",
+				"safe-buffer": "5.1.2",
+				"vary": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+		"node_modules/compression/node_modules/bytes": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+			"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
 			"dev": true,
-			"requires": {
-				"pump": "^3.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"get-symbol-description": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-			"integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.1"
+		"node_modules/compression/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
 			}
 		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-			"dev": true
-		},
-		"getos": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/getos/-/getos-3.1.1.tgz",
-			"integrity": "sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==",
+		"node_modules/compression/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"dev": true,
-			"requires": {
-				"async": "2.6.1"
-			}
+			"license": "MIT"
 		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+		"node_modules/compression/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
+			"license": "MIT"
 		},
-		"github-from-package": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-			"integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-			"dev": true,
-			"optional": true
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+			"license": "MIT"
 		},
-		"glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
+		"node_modules/concat-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+			"engines": [
+				"node >= 0.8"
+			],
+			"license": "MIT",
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.2.2",
+				"typedarray": "^0.0.6"
 			}
 		},
-		"glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+		"node_modules/condense-newlines": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz",
+			"integrity": "sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"is-glob": "^4.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"extend-shallow": "^2.0.1",
+				"is-whitespace": "^0.3.0",
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"glob-to-regexp": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-			"integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==",
-			"dev": true
+		"node_modules/condense-newlines/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"global-dirs": {
+		"node_modules/condense-newlines/node_modules/is-extendable": {
 			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-			"integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
 			"dev": true,
-			"requires": {
-				"ini": "^1.3.4"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true
-		},
-		"globby": {
-			"version": "9.2.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-			"integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
+		"node_modules/condense-newlines/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
 			"dev": true,
-			"requires": {
-				"@types/glob": "^7.1.1",
-				"array-union": "^1.0.2",
-				"dir-glob": "^2.2.2",
-				"fast-glob": "^2.2.6",
-				"glob": "^7.1.3",
-				"ignore": "^4.0.3",
-				"pify": "^4.0.1",
-				"slash": "^2.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"ignore": {
-					"version": "4.0.6",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-					"dev": true
-				}
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"graceful-fs": {
-			"version": "4.2.10",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-			"dev": true
+		"node_modules/config-chain": {
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+			"integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ini": "^1.3.4",
+				"proto-list": "~1.2.1"
+			}
 		},
-		"growl": {
-			"version": "1.10.5",
-			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-			"dev": true
+		"node_modules/config-chain/node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true,
+			"license": "ISC"
 		},
-		"gzip-size": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-			"integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+		"node_modules/connect-history-api-fallback": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
 			"dev": true,
-			"requires": {
-				"duplexer": "^0.1.1",
-				"pify": "^4.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"handle-thing": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-			"dev": true
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
-			"dev": true
+		"node_modules/console-browserify": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+			"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
 		},
-		"har-validator": {
-			"version": "5.1.5",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+		"node_modules/console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
 			"dev": true,
-			"requires": {
-				"ajv": "^6.12.3",
-				"har-schema": "^2.0.0"
-			}
+			"license": "ISC",
+			"optional": true
 		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"requires": {
-				"function-bind": "^1.1.1"
+		"node_modules/consolidate": {
+			"version": "0.15.1",
+			"resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+			"integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+			"deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
+			"license": "MIT",
+			"dependencies": {
+				"bluebird": "^3.1.1"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
 			}
 		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+		"node_modules/constants-browserify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+			"integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
+			"license": "MIT"
+		},
+		"node_modules/content-disposition": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
 			"dev": true,
-			"requires": {
-				"ansi-regex": "^2.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				}
+				"safe-buffer": "5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"has-bigints": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-			"integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
+		"node_modules/content-type": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+		"node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-			"requires": {
-				"get-intrinsic": "^1.1.1"
+		"node_modules/cookie": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+			"integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"has-symbols": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+		"node_modules/cookie-signature": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"has-tostringtag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-			"requires": {
-				"has-symbols": "^1.0.2"
+		"node_modules/copy-concurrently": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+			"deprecated": "This package is no longer supported.",
+			"license": "ISC",
+			"dependencies": {
+				"aproba": "^1.1.1",
+				"fs-write-stream-atomic": "^1.0.8",
+				"iferr": "^0.1.5",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.0"
 			}
 		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
-			"dev": true,
-			"optional": true
+		"node_modules/copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+		"node_modules/copy-webpack-plugin": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz",
+			"integrity": "sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ==",
 			"dev": true,
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"cacache": "^12.0.3",
+				"find-cache-dir": "^2.1.0",
+				"glob-parent": "^3.1.0",
+				"globby": "^7.1.1",
+				"is-glob": "^4.0.1",
+				"loader-utils": "^1.2.3",
+				"minimatch": "^3.0.4",
+				"normalize-path": "^3.0.0",
+				"p-limit": "^2.2.1",
+				"schema-utils": "^1.0.0",
+				"serialize-javascript": "^4.0.0",
+				"webpack-log": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
 			}
 		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+		"node_modules/copy-webpack-plugin/node_modules/find-cache-dir": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+			"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 			"dev": true,
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"commondir": "^1.0.1",
+				"make-dir": "^2.0.0",
+				"pkg-dir": "^3.0.0"
 			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/find-up": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"locate-path": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"hash-base": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+		"node_modules/copy-webpack-plugin/node_modules/globby": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+			"integrity": "sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g==",
 			"dev": true,
-			"requires": {
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+			"license": "MIT",
+			"dependencies": {
+				"array-union": "^1.0.1",
+				"dir-glob": "^2.0.0",
+				"glob": "^7.1.2",
+				"ignore": "^3.3.5",
+				"pify": "^3.0.0",
+				"slash": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"hash-sum": {
+		"node_modules/copy-webpack-plugin/node_modules/ignore": {
+			"version": "3.3.10",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+			"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/copy-webpack-plugin/node_modules/json5": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA=="
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
 		},
-		"hash.js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+		"node_modules/copy-webpack-plugin/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
 			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"he": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-			"integrity": "sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA==",
-			"dev": true
-		},
-		"hex-color-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-			"integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-			"dev": true
-		},
-		"highlight.js": {
-			"version": "10.7.3",
-			"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-			"integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
-			"dev": true
-		},
-		"hmac-drbg": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-			"integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+		"node_modules/copy-webpack-plugin/node_modules/locate-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
 			"dev": true,
-			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^3.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"hoopy": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-			"dev": true
-		},
-		"hosted-git-info": {
-			"version": "2.8.9",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-			"dev": true
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+		"node_modules/copy-webpack-plugin/node_modules/make-dir": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+			"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
 			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"pify": "^4.0.1",
+				"semver": "^5.6.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"hsl-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-			"integrity": "sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A==",
-			"dev": true
-		},
-		"hsla-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-			"integrity": "sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==",
-			"dev": true
-		},
-		"html-encoding-sniffer": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-			"integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+		"node_modules/copy-webpack-plugin/node_modules/make-dir/node_modules/pify": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
 			"dev": true,
-			"requires": {
-				"whatwg-encoding": "^1.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"html-entities": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
-			"integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
-			"dev": true
-		},
-		"html-minifier": {
-			"version": "3.5.21",
-			"resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-			"integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+		"node_modules/copy-webpack-plugin/node_modules/p-locate": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
 			"dev": true,
-			"requires": {
-				"camel-case": "3.0.x",
-				"clean-css": "4.2.x",
-				"commander": "2.17.x",
-				"he": "1.2.x",
-				"param-case": "2.1.x",
-				"relateurl": "0.2.x",
-				"uglify-js": "3.4.x"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"commander": {
-					"version": "2.17.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-					"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-					"dev": true
-				},
-				"he": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-					"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-					"dev": true
-				}
+				"p-limit": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"html-tags": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-			"integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
-			"dev": true
+		"node_modules/copy-webpack-plugin/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"html-webpack-plugin": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
-			"integrity": "sha512-Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg==",
+		"node_modules/copy-webpack-plugin/node_modules/pkg-dir": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+			"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
 			"dev": true,
-			"requires": {
-				"html-minifier": "^3.2.3",
-				"loader-utils": "^0.2.16",
-				"lodash": "^4.17.3",
-				"pretty-error": "^2.0.2",
-				"tapable": "^1.0.0",
-				"toposort": "^1.0.0",
-				"util.promisify": "1.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"big.js": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-					"integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-					"dev": true
-				},
-				"emojis-list": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-					"integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
-					"dev": true
-				},
-				"json5": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
-					"dev": true
-				},
-				"loader-utils": {
-					"version": "0.2.17",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-					"integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
-					"dev": true,
-					"requires": {
-						"big.js": "^3.1.3",
-						"emojis-list": "^2.0.0",
-						"json5": "^0.5.0",
-						"object-assign": "^4.0.1"
-					}
-				},
-				"util.promisify": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-					"integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-					"dev": true,
-					"requires": {
-						"define-properties": "^1.1.2",
-						"object.getownpropertydescriptors": "^2.0.3"
-					}
-				}
+				"find-up": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"htmlparser2": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+		"node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+			"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
 			"dev": true,
-			"requires": {
-				"domelementtype": "^2.0.1",
-				"domhandler": "^4.0.0",
-				"domutils": "^2.5.2",
-				"entities": "^2.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"dom-serializer": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-					"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.2.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domutils": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.2.0",
-						"domhandler": "^4.2.0"
-					}
-				}
+				"ajv": "^6.1.0",
+				"ajv-errors": "^1.0.0",
+				"ajv-keywords": "^3.1.0"
+			},
+			"engines": {
+				"node": ">= 4"
 			}
 		},
-		"http-deceiver": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-			"dev": true
-		},
-		"http-errors": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+		"node_modules/copy-webpack-plugin/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
 			"dev": true,
-			"requires": {
-				"depd": "2.0.0",
-				"inherits": "2.0.4",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"toidentifier": "1.0.1"
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver"
 			}
 		},
-		"http-parser-js": {
-			"version": "0.5.8",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-			"integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-		},
-		"http-proxy": {
-			"version": "1.18.1",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+		"node_modules/copy-webpack-plugin/node_modules/slash": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+			"integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
 			"dev": true,
-			"requires": {
-				"eventemitter3": "^4.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"http-proxy-middleware": {
-			"version": "0.20.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.20.0.tgz",
-			"integrity": "sha512-dNJAk71nEJhPiAczQH9hGvE/MT9kEs+zn2Dh+Hi94PGZe1GluQirC7mw5rdREUtWx6qGS1Gu0bZd4qEAg+REgw==",
+		"node_modules/core-js": {
+			"version": "2.6.5",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+			"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+			"deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+			"license": "MIT"
+		},
+		"node_modules/core-js-compat": {
+			"version": "3.38.1",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
+			"integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
 			"dev": true,
-			"requires": {
-				"http-proxy": "^1.17.0",
-				"is-glob": "^4.0.1",
-				"lodash": "^4.17.14",
-				"micromatch": "^4.0.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"browserslist": "^4.23.3"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/core-js"
 			}
 		},
-		"http-proxy-middleware-secure-cookies": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware-secure-cookies/-/http-proxy-middleware-secure-cookies-0.1.8.tgz",
-			"integrity": "sha512-x4DH8N910xocxW5hjCXI/5XT2huTgTduLEN6vIt/Fve88YsDEs6XOpD/PJAYxYqdlLsnktfEFj5jXIat92B/WA==",
+		"node_modules/core-util-is": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+			"license": "MIT"
+		},
+		"node_modules/cosmiconfig": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+			"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
 			"dev": true,
-			"requires": {
-				"@types/cookie": "^0.4.0",
-				"@types/http-proxy-middleware": "^0.19.3",
-				"@types/inquirer": "^7.3.1",
-				"cookie": "^0.4.1",
-				"inquirer": "^7.3.3",
-				"keytar": "^6.0.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"ansi-escapes": {
-					"version": "4.3.2",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-					"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-					"dev": true,
-					"requires": {
-						"type-fest": "^0.21.3"
-					}
-				},
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"chardet": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-					"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-					"dev": true
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"cli-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-					"integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-					"dev": true
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"cookie": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-					"integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-					"dev": true
-				},
-				"external-editor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-					"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-					"dev": true,
-					"requires": {
-						"chardet": "^0.7.0",
-						"iconv-lite": "^0.4.24",
-						"tmp": "^0.0.33"
-					}
-				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"inquirer": {
-					"version": "7.3.3",
-					"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-					"integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-					"dev": true,
-					"requires": {
-						"ansi-escapes": "^4.2.1",
-						"chalk": "^4.1.0",
-						"cli-cursor": "^3.1.0",
-						"cli-width": "^3.0.0",
-						"external-editor": "^3.0.3",
-						"figures": "^3.0.0",
-						"lodash": "^4.17.19",
-						"mute-stream": "0.0.8",
-						"run-async": "^2.4.0",
-						"rxjs": "^6.6.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0",
-						"through": "^2.3.6"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"mute-stream": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-					"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-					"dev": true
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"dev": true,
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"rxjs": {
-					"version": "6.6.7",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-					"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				},
-				"tmp": {
-					"version": "0.0.33",
-					"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-					"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-					"dev": true,
-					"requires": {
-						"os-tmpdir": "~1.0.2"
-					}
-				},
-				"type-fest": {
-					"version": "0.21.3",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-					"dev": true
-				}
+				"import-fresh": "^2.0.0",
+				"is-directory": "^0.3.1",
+				"js-yaml": "^3.13.1",
+				"parse-json": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"http-signature": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-			"integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
+		"node_modules/crc-32": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+			"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+			"license": "Apache-2.0",
+			"bin": {
+				"crc32": "bin/crc32.njs"
+			},
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"https-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-			"integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-			"dev": true
+		"node_modules/create-ecdh": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+			"license": "MIT",
+			"dependencies": {
+				"bn.js": "^4.1.0",
+				"elliptic": "^6.5.3"
+			}
 		},
-		"human-signals": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-			"dev": true
+		"node_modules/create-ecdh/node_modules/bn.js": {
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"license": "MIT"
 		},
-		"iconv-lite": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3.0.0"
+		"node_modules/create-hash": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+			"license": "MIT",
+			"dependencies": {
+				"cipher-base": "^1.0.1",
+				"inherits": "^2.0.1",
+				"md5.js": "^1.3.4",
+				"ripemd160": "^2.0.1",
+				"sha.js": "^2.4.0"
 			}
 		},
-		"icss-utils": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-			"integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-			"requires": {
-				"postcss": "^7.0.14"
-			},
+		"node_modules/create-hmac": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"cipher-base": "^1.0.3",
+				"create-hash": "^1.1.0",
+				"inherits": "^2.0.1",
+				"ripemd160": "^2.0.0",
+				"safe-buffer": "^5.0.1",
+				"sha.js": "^2.4.8"
 			}
 		},
-		"ieee754": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-			"dev": true
-		},
-		"iferr": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-			"integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==",
-			"dev": true
-		},
-		"ignore": {
-			"version": "3.3.10",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-			"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-			"dev": true
-		},
-		"imask": {
-			"version": "6.4.3",
-			"resolved": "https://registry.npmjs.org/imask/-/imask-6.4.3.tgz",
-			"integrity": "sha512-aH2GHemGkr3cbRBfhogHMIx05eUxdHrZNlKTTLmz8VxpSopuHHJ8+85FsDlBVQqxPlDLhZuwj4lpHHWbLOdBSw=="
-		},
-		"import-cwd": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-			"integrity": "sha512-Ew5AZzJQFqrOV5BTW3EIoHAnoie1LojZLXKcCQ/yTRyVZosBhK1x1ViYjHGf5pAFOq8ZyChZp6m/fSN7pJyZtg==",
+		"node_modules/cross-spawn": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
 			"dev": true,
-			"requires": {
-				"import-from": "^2.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			},
+			"engines": {
+				"node": ">=4.8"
 			}
 		},
-		"import-fresh": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-			"integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+		"node_modules/cross-spawn/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
 			"dev": true,
-			"requires": {
-				"caller-path": "^2.0.0",
-				"resolve-from": "^3.0.0"
-			},
-			"dependencies": {
-				"caller-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-					"integrity": "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==",
-					"dev": true,
-					"requires": {
-						"caller-callsite": "^2.0.0"
-					}
-				},
-				"resolve-from": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-					"integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-					"dev": true
-				}
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver"
 			}
 		},
-		"import-from": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-			"integrity": "sha512-0vdnLL2wSGnhlRmzHJAg5JHjt1l2vYhzJ7tNLGbeVg0fse56tpGaH0uzH+r9Slej+BSXXEHvBKDEnVSLLE9/+w==",
+		"node_modules/crypt": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+			"integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
 			"dev": true,
-			"requires": {
-				"resolve-from": "^3.0.0"
-			},
-			"dependencies": {
-				"resolve-from": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-					"integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-					"dev": true
-				}
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"import-local": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-			"integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-			"dev": true,
-			"requires": {
-				"pkg-dir": "^3.0.0",
-				"resolve-cwd": "^2.0.0"
-			},
+		"node_modules/crypto-browserify": {
+			"version": "3.12.0",
+			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+			"license": "MIT",
 			"dependencies": {
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
-				}
+				"browserify-cipher": "^1.0.0",
+				"browserify-sign": "^4.0.0",
+				"create-ecdh": "^4.0.0",
+				"create-hash": "^1.1.0",
+				"create-hmac": "^1.1.0",
+				"diffie-hellman": "^5.0.0",
+				"inherits": "^2.0.1",
+				"pbkdf2": "^3.0.3",
+				"public-encrypt": "^4.0.0",
+				"randombytes": "^2.0.0",
+				"randomfill": "^1.0.3"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-			"dev": true
+		"node_modules/crypto-js": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+			"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+			"license": "MIT"
 		},
-		"indent-string": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-			"integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
+		"node_modules/css-color-names": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+			"integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
 			"dev": true,
-			"requires": {
-				"repeating": "^2.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"indexes-of": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-			"integrity": "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==",
-			"dev": true
-		},
-		"infer-owner": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-			"integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-			"dev": true
-		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+		"node_modules/css-declaration-sorter": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+			"integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
 			"dev": true,
-			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.1",
+				"timsort": "^0.3.0"
+			},
+			"engines": {
+				"node": ">4"
 			}
 		},
-		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-		},
-		"ini": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-			"dev": true
+		"node_modules/css-element-queries": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/css-element-queries/-/css-element-queries-1.2.1.tgz",
+			"integrity": "sha512-hiI1tSzf+U/gE13qhfwnCvN90Ay0THnE+mT3pjN/c/mvFmEUHZVNrvMJrrkw2ppOzkl69FdgH2ZGZENYQUaN2A==",
+			"license": "MIT"
 		},
-		"inquirer": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-			"integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"ansi-escapes": "^3.0.0",
-				"chalk": "^2.0.0",
-				"cli-cursor": "^2.1.0",
-				"cli-width": "^2.0.0",
-				"external-editor": "^2.0.4",
-				"figures": "^2.0.0",
-				"lodash": "^4.3.0",
-				"mute-stream": "0.0.7",
-				"run-async": "^2.2.0",
-				"rx-lite": "^4.0.8",
-				"rx-lite-aggregates": "^4.0.8",
-				"string-width": "^2.1.0",
-				"strip-ansi": "^4.0.0",
-				"through": "^2.3.6"
-			},
+		"node_modules/css-loader": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.2.0.tgz",
+			"integrity": "sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ==",
+			"license": "MIT",
 			"dependencies": {
-				"ansi-escapes": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-					"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-					"dev": true,
-					"optional": true
-				},
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true,
-					"optional": true
-				},
-				"figures": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-					"integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true,
-					"optional": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
+				"camelcase": "^5.3.1",
+				"cssesc": "^3.0.0",
+				"icss-utils": "^4.1.1",
+				"loader-utils": "^1.2.3",
+				"normalize-path": "^3.0.0",
+				"postcss": "^7.0.17",
+				"postcss-modules-extract-imports": "^2.0.0",
+				"postcss-modules-local-by-default": "^3.0.2",
+				"postcss-modules-scope": "^2.1.0",
+				"postcss-modules-values": "^3.0.0",
+				"postcss-value-parser": "^4.0.0",
+				"schema-utils": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0"
 			}
 		},
-		"install": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/install/-/install-0.13.0.tgz",
-			"integrity": "sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA=="
-		},
-		"internal-ip": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-			"integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-			"dev": true,
-			"requires": {
-				"default-gateway": "^4.2.0",
-				"ipaddr.js": "^1.9.0"
-			},
+		"node_modules/css-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"license": "MIT",
 			"dependencies": {
-				"default-gateway": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-					"integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-					"dev": true,
-					"requires": {
-						"execa": "^1.0.0",
-						"ip-regex": "^2.1.0"
-					}
-				}
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"internal-slot": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-			"requires": {
-				"get-intrinsic": "^1.1.0",
-				"has": "^1.0.3",
-				"side-channel": "^1.0.4"
+		"node_modules/css-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"interpret": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-			"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-			"dev": true
-		},
-		"invariant": {
-			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-			"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+		"node_modules/css-select": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
 			"dev": true,
-			"requires": {
-				"loose-envify": "^1.0.0"
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^6.0.1",
+				"domhandler": "^4.3.1",
+				"domutils": "^2.8.0",
+				"nth-check": "^2.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
 			}
 		},
-		"invert-kv": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-			"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-			"dev": true
-		},
-		"ip": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-			"integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
-			"dev": true
-		},
-		"ip-regex": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-			"integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
-			"dev": true
-		},
-		"ipaddr.js": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-			"dev": true
-		},
-		"is-absolute-url": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-			"integrity": "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==",
-			"dev": true
+		"node_modules/css-select-base-adapter": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+			"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+		"node_modules/css-tree": {
+			"version": "1.0.0-alpha.37",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+			"integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"mdn-data": "2.0.4",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
 			}
 		},
-		"is-arguments": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
+		"node_modules/css-what": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
 			}
 		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-			"dev": true
-		},
-		"is-bigint": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-			"requires": {
-				"has-bigints": "^1.0.1"
+		"node_modules/cssesc": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+			"license": "MIT",
+			"bin": {
+				"cssesc": "bin/cssesc"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"is-binary-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+		"node_modules/cssnano": {
+			"version": "4.1.11",
+			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
+			"integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"binary-extensions": "^2.0.0"
-			}
-		},
-		"is-boolean-object": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"cosmiconfig": "^5.0.0",
+				"cssnano-preset-default": "^4.0.8",
+				"is-resolvable": "^1.0.0",
+				"postcss": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"is-callable": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-		},
-		"is-ci": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-			"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+		"node_modules/cssnano-preset-default": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
+			"integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
 			"dev": true,
-			"requires": {
-				"ci-info": "^1.5.0"
+			"license": "MIT",
+			"dependencies": {
+				"css-declaration-sorter": "^4.0.1",
+				"cssnano-util-raw-cache": "^4.0.1",
+				"postcss": "^7.0.0",
+				"postcss-calc": "^7.0.1",
+				"postcss-colormin": "^4.0.3",
+				"postcss-convert-values": "^4.0.1",
+				"postcss-discard-comments": "^4.0.2",
+				"postcss-discard-duplicates": "^4.0.2",
+				"postcss-discard-empty": "^4.0.1",
+				"postcss-discard-overridden": "^4.0.1",
+				"postcss-merge-longhand": "^4.0.11",
+				"postcss-merge-rules": "^4.0.3",
+				"postcss-minify-font-values": "^4.0.2",
+				"postcss-minify-gradients": "^4.0.2",
+				"postcss-minify-params": "^4.0.2",
+				"postcss-minify-selectors": "^4.0.2",
+				"postcss-normalize-charset": "^4.0.1",
+				"postcss-normalize-display-values": "^4.0.2",
+				"postcss-normalize-positions": "^4.0.2",
+				"postcss-normalize-repeat-style": "^4.0.2",
+				"postcss-normalize-string": "^4.0.2",
+				"postcss-normalize-timing-functions": "^4.0.2",
+				"postcss-normalize-unicode": "^4.0.1",
+				"postcss-normalize-url": "^4.0.1",
+				"postcss-normalize-whitespace": "^4.0.2",
+				"postcss-ordered-values": "^4.1.2",
+				"postcss-reduce-initial": "^4.0.3",
+				"postcss-reduce-transforms": "^4.0.2",
+				"postcss-svgo": "^4.0.3",
+				"postcss-unique-selectors": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"is-color-stop": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-			"integrity": "sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA==",
+		"node_modules/cssnano-util-get-arguments": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+			"integrity": "sha512-6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw==",
 			"dev": true,
-			"requires": {
-				"css-color-names": "^0.0.4",
-				"hex-color-regex": "^1.1.0",
-				"hsl-regex": "^1.0.0",
-				"hsla-regex": "^1.0.0",
-				"rgb-regex": "^1.0.1",
-				"rgba-regex": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"is-core-module": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-			"integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-			"requires": {
-				"has": "^1.0.3"
+		"node_modules/cssnano-util-get-match": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+			"integrity": "sha512-JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+		"node_modules/cssnano-util-raw-cache": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+			"integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"postcss": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"is-date-object": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-			"requires": {
-				"has-tostringtag": "^1.0.0"
+		"node_modules/cssnano-util-same-parent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+			"integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+		"node_modules/csso": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
 			"dev": true,
-			"requires": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"css-tree": "^1.1.2"
 			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/csso/node_modules/css-tree": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+			"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-					"dev": true
-				}
+				"mdn-data": "2.0.14",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
 			}
 		},
-		"is-directory": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-			"integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
-			"dev": true
+		"node_modules/csso/node_modules/mdn-data": {
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+			"dev": true,
+			"license": "CC0-1.0"
 		},
-		"is-docker": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-			"dev": true
+		"node_modules/cssom": {
+			"version": "0.3.8",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+			"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-			"dev": true
+		"node_modules/cssstyle": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+			"integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssom": "0.3.x"
+			}
 		},
-		"is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-			"dev": true
+		"node_modules/csstype": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+			"license": "MIT"
 		},
-		"is-finite": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-			"integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-			"dev": true
+		"node_modules/cyclist": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz",
+			"integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==",
+			"license": "MIT"
 		},
-		"is-fullwidth-code-point": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-			"integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+		"node_modules/cypress": {
+			"version": "13.13.3",
+			"resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.3.tgz",
+			"integrity": "sha512-hUxPrdbJXhUOTzuML+y9Av7CKoYznbD83pt8g3klgpioEha0emfx4WNIuVRx0C76r0xV2MIwAW9WYiXfVJYFQw==",
 			"dev": true,
-			"requires": {
-				"number-is-nan": "^1.0.0"
+			"hasInstallScript": true,
+			"license": "MIT",
+			"dependencies": {
+				"@cypress/request": "^3.0.1",
+				"@cypress/xvfb": "^1.2.4",
+				"@types/sinonjs__fake-timers": "8.1.1",
+				"@types/sizzle": "^2.3.2",
+				"arch": "^2.2.0",
+				"blob-util": "^2.0.2",
+				"bluebird": "^3.7.2",
+				"buffer": "^5.7.1",
+				"cachedir": "^2.3.0",
+				"chalk": "^4.1.0",
+				"check-more-types": "^2.24.0",
+				"cli-cursor": "^3.1.0",
+				"cli-table3": "~0.6.1",
+				"commander": "^6.2.1",
+				"common-tags": "^1.8.0",
+				"dayjs": "^1.10.4",
+				"debug": "^4.3.4",
+				"enquirer": "^2.3.6",
+				"eventemitter2": "6.4.7",
+				"execa": "4.1.0",
+				"executable": "^4.1.1",
+				"extract-zip": "2.0.1",
+				"figures": "^3.2.0",
+				"fs-extra": "^9.1.0",
+				"getos": "^3.2.1",
+				"is-ci": "^3.0.1",
+				"is-installed-globally": "~0.4.0",
+				"lazy-ass": "^1.6.0",
+				"listr2": "^3.8.3",
+				"lodash": "^4.17.21",
+				"log-symbols": "^4.0.0",
+				"minimist": "^1.2.8",
+				"ospath": "^1.2.2",
+				"pretty-bytes": "^5.6.0",
+				"process": "^0.11.10",
+				"proxy-from-env": "1.0.0",
+				"request-progress": "^3.0.0",
+				"semver": "^7.5.3",
+				"supports-color": "^8.1.1",
+				"tmp": "~0.2.3",
+				"untildify": "^4.0.0",
+				"yauzl": "^2.10.0"
+			},
+			"bin": {
+				"cypress": "bin/cypress"
+			},
+			"engines": {
+				"node": "^16.0.0 || ^18.0.0 || >=20.0.0"
 			}
 		},
-		"is-generator-function": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-			"requires": {
-				"has-tostringtag": "^1.0.0"
+		"node_modules/cypress/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+		"node_modules/cypress/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"is-extglob": "^2.1.1"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"is-installed-globally": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
-			"integrity": "sha512-ERNhMg+i/XgDwPIPF3u24qpajVreaiSuvpb1Uu0jugw7KKcxGyCX8cgp8P5fwTmAuXku6beDHHECdKArjlg7tw==",
+		"node_modules/cypress/node_modules/chalk/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"global-dirs": "^0.1.0",
-				"is-path-inside": "^1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-map": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-			"integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="
+		"node_modules/cypress/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
 		},
-		"is-negative-zero": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-			"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
+		"node_modules/cypress/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"is-number": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-			"integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+		"node_modules/cypress/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"is-number-object": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-			"integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-			"requires": {
-				"has-tostringtag": "^1.0.0"
+		"node_modules/cypress/node_modules/execa": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+			"integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cross-spawn": "^7.0.0",
+				"get-stream": "^5.0.0",
+				"human-signals": "^1.1.1",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.0",
+				"onetime": "^5.1.0",
+				"signal-exit": "^3.0.2",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
-		"is-obj": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-			"integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-			"dev": true
-		},
-		"is-observable": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz",
-			"integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
+		"node_modules/cypress/node_modules/fs-extra": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+			"integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
 			"dev": true,
-			"requires": {
-				"symbol-observable": "^1.1.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"symbol-observable": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-					"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-					"dev": true
-				}
+				"at-least-node": "^1.0.0",
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"is-path-cwd": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-			"integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+		"node_modules/cypress/node_modules/get-stream": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
 			"dev": true,
-			"requires": {
-				"is-path-inside": "^2.1.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"is-path-inside": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-					"integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-					"dev": true,
-					"requires": {
-						"path-is-inside": "^1.0.2"
-					}
-				}
+				"pump": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"is-path-inside": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-			"integrity": "sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==",
+		"node_modules/cypress/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"path-is-inside": "^1.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-plain-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-			"dev": true
+		"node_modules/cypress/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+		"node_modules/cypress/node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
 			"dev": true,
-			"requires": {
-				"isobject": "^3.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
 			}
 		},
-		"is-promise": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-			"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-			"dev": true
-		},
-		"is-regex": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
+		"node_modules/cypress/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-resolvable": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-			"integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-			"dev": true
-		},
-		"is-set": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-			"integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="
+		"node_modules/cypress/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-shared-array-buffer": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-			"integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-			"requires": {
-				"call-bind": "^1.0.2"
+		"node_modules/cypress/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-			"dev": true
+		"node_modules/cypress/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-string": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-			"requires": {
-				"has-tostringtag": "^1.0.0"
+		"node_modules/cypress/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-symbol": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-			"integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-			"requires": {
-				"has-symbols": "^1.0.2"
+		"node_modules/cypress/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
-		"is-typed-array": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-			"integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
-			"requires": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"es-abstract": "^1.20.0",
-				"for-each": "^0.3.3",
-				"has-tostringtag": "^1.0.0"
+		"node_modules/cypress/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 10.0.0"
 			}
 		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-			"dev": true
+		"node_modules/cypress/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"is-valid-glob": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-			"integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
-			"dev": true
+		"node_modules/d3-array": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
+			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
+			"license": "BSD-3-Clause"
 		},
-		"is-weakmap": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-			"integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="
+		"node_modules/d3-dispatch": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz",
+			"integrity": "sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==",
+			"license": "BSD-3-Clause"
 		},
-		"is-weakref": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-			"integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-			"requires": {
-				"call-bind": "^1.0.2"
+		"node_modules/d3-force": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz",
+			"integrity": "sha512-nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-dispatch": "1 - 2",
+				"d3-quadtree": "1 - 2",
+				"d3-timer": "1 - 2"
 			}
 		},
-		"is-weakset": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-			"integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.1"
+		"node_modules/d3-geo": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
+			"integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-array": "1"
 			}
 		},
-		"is-whitespace": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
-			"integrity": "sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==",
-			"dev": true
-		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-			"dev": true
+		"node_modules/d3-geo-projection": {
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-2.9.0.tgz",
+			"integrity": "sha512-ZULvK/zBn87of5rWAfFMc9mJOipeSo57O+BBitsKIXmU4rTVAnX1kSsJkE0R+TxY8pGNoM1nbyRRE7GYHhdOEQ==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"commander": "2",
+				"d3-array": "1",
+				"d3-geo": "^1.12.0",
+				"resolve": "^1.1.10"
+			},
+			"bin": {
+				"geo2svg": "bin/geo2svg",
+				"geograticule": "bin/geograticule",
+				"geoproject": "bin/geoproject",
+				"geoquantize": "bin/geoquantize",
+				"geostitch": "bin/geostitch"
+			}
 		},
-		"is-wsl": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-			"integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-			"dev": true
+		"node_modules/d3-geo-projection/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"license": "MIT"
 		},
-		"isarray": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+		"node_modules/d3-quadtree": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz",
+			"integrity": "sha512-b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw==",
+			"license": "BSD-3-Clause"
 		},
-		"isexe": {
+		"node_modules/d3-timer": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz",
+			"integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==",
+			"license": "BSD-3-Clause"
 		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-			"dev": true
+		"node_modules/dashdash": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+			"integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
 		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-			"dev": true
+		"node_modules/data-urls": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+			"integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"abab": "^2.0.0",
+				"whatwg-mimetype": "^2.2.0",
+				"whatwg-url": "^7.0.0"
+			}
 		},
-		"javascript-natural-sort": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-			"integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
+		"node_modules/data-view-buffer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+			"integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.6",
+				"es-errors": "^1.3.0",
+				"is-data-view": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"javascript-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
-			"integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
-			"dev": true
+		"node_modules/data-view-byte-length": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+			"integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"is-data-view": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"jest-worker": {
-			"version": "25.5.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
-			"integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
+		"node_modules/data-view-byte-offset": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+			"integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
 			"dev": true,
-			"requires": {
-				"merge-stream": "^2.0.0",
-				"supports-color": "^7.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.6",
+				"es-errors": "^1.3.0",
+				"is-data-view": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"jmespath": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-			"integrity": "sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w=="
+		"node_modules/date-fns": {
+			"version": "1.30.1",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+			"integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/dayjs": {
+			"version": "1.11.13",
+			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+			"integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+			"license": "MIT"
 		},
-		"js-beautify": {
-			"version": "1.14.6",
-			"resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.6.tgz",
-			"integrity": "sha512-GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw==",
+		"node_modules/de-indent": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+			"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
 			"dev": true,
-			"requires": {
-				"config-chain": "^1.1.13",
-				"editorconfig": "^0.15.3",
-				"glob": "^8.0.3",
-				"nopt": "^6.0.0"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"glob": {
-					"version": "8.0.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-					"integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^5.0.1",
-						"once": "^1.3.0"
-					}
-				},
-				"minimatch": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-					"integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
+			"license": "MIT"
+		},
+		"node_modules/debug": {
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+			"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.3"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
 				}
 			}
 		},
-		"js-levenshtein": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-			"integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-			"dev": true
-		},
-		"js-message": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz",
-			"integrity": "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==",
-			"dev": true
+		"node_modules/decache": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/decache/-/decache-4.6.2.tgz",
+			"integrity": "sha512-2LPqkLeu8XWHU8qNCS3kcF6sCcb5zIzvWaAHYSvPfwhdd7mHuah29NssMzrTYyHN4F5oFy2ko9OBYxegtU0FEw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"callsite": "^1.0.0"
+			}
 		},
-		"js-queue": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/js-queue/-/js-queue-2.0.2.tgz",
-			"integrity": "sha512-pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA==",
+		"node_modules/decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
 			"dev": true,
-			"requires": {
-				"easy-stack": "^1.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
+		"node_modules/decimal-format": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/decimal-format/-/decimal-format-2.0.2.tgz",
+			"integrity": "sha512-a8LTpULkMAib4ny4CiP3ysFKcc4kcSz1O2jY7Cp35ncNKi2apTBZLTJ0Vl2Fl3VdsHpkZ20B/mRu/gcaiT+nNA==",
+			"license": "ISC"
 		},
-		"js-yaml": {
-			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-			"dev": true,
-			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
+		"node_modules/decode-uri-component": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+			"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10"
 			}
 		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-			"dev": true
+		"node_modules/decompress-response": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+			"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"mimic-response": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"jsdom": {
-			"version": "13.2.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz",
-			"integrity": "sha512-cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw==",
+		"node_modules/deep-eql": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+			"integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
 			"dev": true,
-			"requires": {
-				"abab": "^2.0.0",
-				"acorn": "^6.0.4",
-				"acorn-globals": "^4.3.0",
-				"array-equal": "^1.0.0",
-				"cssom": "^0.3.4",
-				"cssstyle": "^1.1.1",
-				"data-urls": "^1.1.0",
-				"domexception": "^1.0.1",
-				"escodegen": "^1.11.0",
-				"html-encoding-sniffer": "^1.0.2",
-				"nwsapi": "^2.0.9",
-				"parse5": "5.1.0",
-				"pn": "^1.1.0",
-				"request": "^2.88.0",
-				"request-promise-native": "^1.0.5",
-				"saxes": "^3.1.5",
-				"symbol-tree": "^3.2.2",
-				"tough-cookie": "^2.5.0",
-				"w3c-hr-time": "^1.0.1",
-				"w3c-xmlserializer": "^1.0.1",
-				"webidl-conversions": "^4.0.2",
-				"whatwg-encoding": "^1.0.5",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^7.0.0",
-				"ws": "^6.1.2",
-				"xml-name-validator": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"type-detect": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=0.12"
 			}
 		},
-		"jsdom-global": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/jsdom-global/-/jsdom-global-3.0.2.tgz",
-			"integrity": "sha512-t1KMcBkz/pT5JrvcJbpUR2u/w1kO9jXctaaGJ0vZDzwFnIvGWw9IDSRciT83kIs8Bnw4qpOl8bQK08V01YgMPg==",
-			"dev": true
-		},
-		"jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true
-		},
-		"json-parse-better-errors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-			"dev": true
-		},
-		"json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-			"integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-			"dev": true
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-		},
-		"json-source-map": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/json-source-map/-/json-source-map-0.4.0.tgz",
-			"integrity": "sha512-fVJ2mGl6pmYNmgseQch8X1ghdDntxeYgQQueypu9ZvttZwlSQuW4QztPBxgomRiRBidj5g7PtTW+7EqsTnEDNw=="
+		"node_modules/deep-equal": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
+			"integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
+			"license": "MIT",
+			"dependencies": {
+				"array-buffer-byte-length": "^1.0.0",
+				"call-bind": "^1.0.5",
+				"es-get-iterator": "^1.1.3",
+				"get-intrinsic": "^1.2.2",
+				"is-arguments": "^1.1.1",
+				"is-array-buffer": "^3.0.2",
+				"is-date-object": "^1.0.5",
+				"is-regex": "^1.1.4",
+				"is-shared-array-buffer": "^1.0.2",
+				"isarray": "^2.0.5",
+				"object-is": "^1.1.5",
+				"object-keys": "^1.1.1",
+				"object.assign": "^4.1.4",
+				"regexp.prototype.flags": "^1.5.1",
+				"side-channel": "^1.0.4",
+				"which-boxed-primitive": "^1.0.2",
+				"which-collection": "^1.0.1",
+				"which-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-			"dev": true
+		"node_modules/deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=4.0.0"
+			}
 		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-			"dev": true
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-			"requires": {
-				"minimist": "^1.2.0"
+		"node_modules/deepmerge": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"jsoneditor": {
-			"version": "5.34.0",
-			"resolved": "https://registry.npmjs.org/jsoneditor/-/jsoneditor-5.34.0.tgz",
-			"integrity": "sha512-/F7L6oXuRkv2/FKFIL4NMWF0P+oVvSWLJPVEVP/7KGehBj6dtOp5FKdfLcNkIgbqzklXx/NDzHSXYlf64wqmuQ==",
-			"requires": {
-				"ajv": "5.5.2",
-				"brace": "0.11.1",
-				"javascript-natural-sort": "0.7.1",
-				"jmespath": "0.15.0",
-				"json-source-map": "0.4.0",
-				"mobius1-selectr": "2.4.10",
-				"picomodal": "3.0.0",
-				"vanilla-picker": "2.8.0"
-			},
+		"node_modules/default-gateway": {
+			"version": "5.0.5",
+			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz",
+			"integrity": "sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA==",
+			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw=="
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA=="
-				}
+				"execa": "^3.3.0"
+			},
+			"engines": {
+				"node": "^8.12.0 || >=9.7.0"
 			}
 		},
-		"jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+		"node_modules/default-gateway/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.6"
+			"license": "MIT",
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"jsprim": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-			"integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+		"node_modules/default-gateway/node_modules/execa": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
+			"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
 			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.4.0",
-				"verror": "1.10.0"
+			"license": "MIT",
+			"dependencies": {
+				"cross-spawn": "^7.0.0",
+				"get-stream": "^5.0.0",
+				"human-signals": "^1.1.1",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.0",
+				"onetime": "^5.1.0",
+				"p-finally": "^2.0.0",
+				"signal-exit": "^3.0.2",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": "^8.12.0 || >=9.7.0"
 			}
 		},
-		"just-extend": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
-			"integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg=="
-		},
-		"keytar": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/keytar/-/keytar-6.0.1.tgz",
-			"integrity": "sha512-1Ihpf2tdM3sLwGMkYHXYhVC/hx5BDR7CWFL4IrBA3IDZo0xHhS2nM+tU9Y+u/U7okNfbVkwmKsieLkcWRMh93g==",
+		"node_modules/default-gateway/node_modules/get-stream": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"node-addon-api": "^3.0.0",
-				"prebuild-install": "5.3.4"
+			"license": "MIT",
+			"dependencies": {
+				"pump": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"killable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-			"integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-			"dev": true
-		},
-		"kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true
+		"node_modules/default-gateway/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"launch-editor": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
-			"integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+		"node_modules/default-gateway/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 			"dev": true,
-			"requires": {
-				"picocolors": "^1.0.0",
-				"shell-quote": "^1.7.3"
+			"license": "MIT",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"launch-editor-middleware": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.6.0.tgz",
-			"integrity": "sha512-K2yxgljj5TdCeRN1lBtO3/J26+AIDDDw+04y6VAiZbWcTdBwsYN6RrZBnW5DN/QiSIdKNjKdATLUUluWWFYTIA==",
+		"node_modules/default-gateway/node_modules/p-finally": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+			"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
 			"dev": true,
-			"requires": {
-				"launch-editor": "^2.6.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"lazy-ass": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-			"integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
-			"dev": true
+		"node_modules/default-gateway/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"lcid": {
+		"node_modules/default-gateway/node_modules/shebang-command": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-			"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
-			"requires": {
-				"invert-kv": "^2.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"levn": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-			"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+		"node_modules/default-gateway/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"linebreak": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/linebreak/-/linebreak-1.1.0.tgz",
-			"integrity": "sha512-MHp03UImeVhB7XZtjd0E4n6+3xr5Dq/9xI/5FptGk5FrbDR3zagPa2DS6U8ks/3HjbKWG9Q1M2ufOzxV2qLYSQ==",
-			"requires": {
-				"base64-js": "0.0.8",
-				"unicode-trie": "^2.0.0"
+		"node_modules/default-gateway/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"lines-and-columns": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-			"dev": true
-		},
-		"listr": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
-			"integrity": "sha512-5GlrcOoGOBd/hFSI7hMvVXb+5jFMVc17e1VQzpa7VJna1SDTYSCrCpqBQUkuWW18xibTR+PQndjVtuEBKtOWVw==",
+		"node_modules/defaults": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+			"integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
 			"dev": true,
-			"requires": {
-				"chalk": "^1.1.3",
-				"cli-truncate": "^0.2.1",
-				"figures": "^1.7.0",
-				"indent-string": "^2.1.0",
-				"is-promise": "^2.1.0",
-				"is-stream": "^1.1.0",
-				"listr-silent-renderer": "^1.1.1",
-				"listr-update-renderer": "^0.2.0",
-				"listr-verbose-renderer": "^0.4.0",
-				"log-symbols": "^1.0.2",
-				"log-update": "^1.0.2",
-				"ora": "^0.2.3",
-				"p-map": "^1.1.1",
-				"rxjs": "^5.0.0-beta.11",
-				"stream-to-observable": "^0.1.0",
-				"strip-ansi": "^3.0.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-					"integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^1.0.1"
-					}
-				},
-				"cli-spinners": {
-					"version": "0.1.2",
-					"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
-					"integrity": "sha512-t22oC6e068eEBQ86SO3arUtd1ojcA3/lz3Fp2g/oL/lmDlFz/2yD8JHiebeCGYmoAovYpwKq4T64Uq5j+28Q9w==",
-					"dev": true
-				},
-				"log-symbols": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-					"integrity": "sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==",
-					"dev": true,
-					"requires": {
-						"chalk": "^1.0.0"
-					}
-				},
-				"onetime": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
-					"dev": true
-				},
-				"ora": {
-					"version": "0.2.3",
-					"resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
-					"integrity": "sha512-MYGyg17e2GcoDlFrAP39zu4nrAQ+STzl4fosWjR8vAlT0a2wKuuAGZTecffdVLPsnEfxXVlrUcDZ1DU5skr+QQ==",
-					"dev": true,
-					"requires": {
-						"chalk": "^1.1.1",
-						"cli-cursor": "^1.0.2",
-						"cli-spinners": "^0.1.2",
-						"object-assign": "^4.0.1"
-					}
-				},
-				"restore-cursor": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-					"integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
-					"dev": true,
-					"requires": {
-						"exit-hook": "^1.0.0",
-						"onetime": "^1.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-					"dev": true
-				}
+				"clone": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"listr-silent-renderer": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
-			"integrity": "sha512-L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA==",
-			"dev": true
-		},
-		"listr-update-renderer": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
-			"integrity": "sha512-0G/CLBomVga7gpCMHw5Adg9kafRz0HDAOxa1GrWywXr1oNYRW/n4pPy7xF/hniRCLRCorZMCxaMGSmgsp1QHsA==",
+		"node_modules/defaults/node_modules/clone": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+			"integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
 			"dev": true,
-			"requires": {
-				"chalk": "^1.1.3",
-				"cli-truncate": "^0.2.1",
-				"elegant-spinner": "^1.0.1",
-				"figures": "^1.7.0",
-				"indent-string": "^3.0.0",
-				"log-symbols": "^1.0.2",
-				"log-update": "^1.0.2",
-				"strip-ansi": "^3.0.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"indent-string": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-					"integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
-					"dev": true
-				},
-				"log-symbols": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-					"integrity": "sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==",
-					"dev": true,
-					"requires": {
-						"chalk": "^1.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-					"dev": true
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"listr-verbose-renderer": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
-			"integrity": "sha512-tWEhvyB9UUq+4fkEwQ2NQK2JfYhsc3slSeYRkuc9CiJ3GFMRa5CRUcmqo+IIF+L95uZqv5dzZDC6vCggC28C0g==",
-			"dev": true,
-			"requires": {
-				"chalk": "^1.1.3",
-				"cli-cursor": "^1.0.2",
-				"date-fns": "^1.27.2",
-				"figures": "^1.7.0"
-			},
+		"node_modules/define-data-property": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-					"integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^1.0.1"
-					}
-				},
-				"onetime": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
-					"dev": true
-				},
-				"restore-cursor": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-					"integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
-					"dev": true,
-					"requires": {
-						"exit-hook": "^1.0.0",
-						"onetime": "^1.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-					"dev": true
-				}
-			}
-		},
-		"loader-fs-cache": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz",
-			"integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==",
-			"dev": true,
-			"requires": {
-				"find-cache-dir": "^0.1.1",
-				"mkdirp": "^0.5.1"
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.0.1"
 			},
-			"dependencies": {
-				"find-cache-dir": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
-					"integrity": "sha512-Z9XSBoNE7xQiV6MSgPuCfyMokH2K7JdpRkOYE1+mu3d4BFJtx3GW+f6Bo4q8IX6rlf5MYbLBKW0pjl2cWdkm2A==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"mkdirp": "^0.5.1",
-						"pkg-dir": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-					"dev": true,
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-					"dev": true,
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"pkg-dir": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-					"integrity": "sha512-c6pv3OE78mcZ92ckebVDqg0aWSoKhOTbwCV6qbCWMk546mAL9pZln0+QsN/yQ7fkucd4+yJPLrCBXNt8Ruk+Eg==",
-					"dev": true,
-					"requires": {
-						"find-up": "^1.0.0"
-					}
-				}
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"loader-runner": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-			"integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-			"dev": true
-		},
-		"loader-utils": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-			"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-			"requires": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
+		"node_modules/define-properties": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+			"license": "MIT",
+			"dependencies": {
+				"define-data-property": "^1.0.1",
+				"has-property-descriptors": "^1.0.0",
+				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"locate-path": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-			"integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
-			"dev": true,
-			"requires": {
-				"p-locate": "^2.0.0",
-				"path-exists": "^3.0.0"
+		"node_modules/define-property": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+			"license": "MIT",
+			"dependencies": {
+				"is-descriptor": "^1.0.2",
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"lodash": {
-			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-		},
-		"lodash.debounce": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-			"dev": true
-		},
-		"lodash.defaultsdeep": {
-			"version": "4.6.1",
-			"resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
-			"integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
-			"dev": true
-		},
-		"lodash.get": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="
-		},
-		"lodash.kebabcase": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
-			"integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
-			"dev": true
-		},
-		"lodash.mapvalues": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-			"integrity": "sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==",
-			"dev": true
-		},
-		"lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-			"dev": true
-		},
-		"lodash.once": {
+		"node_modules/del": {
 			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-			"integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
-			"dev": true
-		},
-		"lodash.sortby": {
-			"version": "4.7.0",
-			"resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-			"integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
-			"dev": true
-		},
-		"lodash.transform": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
-			"integrity": "sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ==",
-			"dev": true
-		},
-		"lodash.uniq": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-			"dev": true
-		},
-		"log-symbols": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-			"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+			"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+			"integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
 			"dev": true,
-			"requires": {
-				"chalk": "^2.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"@types/glob": "^7.1.1",
+				"globby": "^6.1.0",
+				"is-path-cwd": "^2.0.0",
+				"is-path-in-cwd": "^2.0.0",
+				"p-map": "^2.0.0",
+				"pify": "^4.0.1",
+				"rimraf": "^2.6.3"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"log-update": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
-			"integrity": "sha512-4vSow8gbiGnwdDNrpy1dyNaXWKSCIPop0EHdE8GrnngHoJujM3QhvHUN/igsYCgPoHo7pFOezlJ61Hlln0KHyA==",
+		"node_modules/del/node_modules/globby": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+			"integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
 			"dev": true,
-			"requires": {
-				"ansi-escapes": "^1.0.0",
-				"cli-cursor": "^1.0.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"cli-cursor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-					"integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^1.0.1"
-					}
-				},
-				"onetime": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
-					"dev": true
-				},
-				"restore-cursor": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-					"integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
-					"dev": true,
-					"requires": {
-						"exit-hook": "^1.0.0",
-						"onetime": "^1.0.0"
-					}
-				}
+				"array-union": "^1.0.1",
+				"glob": "^7.0.3",
+				"object-assign": "^4.0.1",
+				"pify": "^2.0.0",
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"loglevel": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz",
-			"integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
-			"dev": true
-		},
-		"loose-envify": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+		"node_modules/del/node_modules/globby/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
 			"dev": true,
-			"requires": {
-				"js-tokens": "^3.0.0 || ^4.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"lower-case": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-			"integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
-			"dev": true
-		},
-		"lru-cache": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-			"requires": {
-				"pseudomap": "^1.0.2",
-				"yallist": "^2.1.2"
+		"node_modules/del/node_modules/p-map": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+			"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+		"node_modules/del/node_modules/pify": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
 			"dev": true,
-			"requires": {
-				"semver": "^6.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"map-age-cleaner": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-			"integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
 			"dev": true,
-			"requires": {
-				"p-defer": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.4.0"
 			}
 		},
-		"map-cache": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-			"integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-			"dev": true
-		},
-		"map-visit": {
+		"node_modules/delegates": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-			"integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+			"integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
 			"dev": true,
-			"requires": {
-				"object-visit": "^1.0.0"
-			}
+			"license": "MIT",
+			"optional": true
 		},
-		"md5": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-			"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+		"node_modules/depd": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
 			"dev": true,
-			"requires": {
-				"charenc": "0.0.2",
-				"crypt": "0.0.2",
-				"is-buffer": "~1.1.6"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"md5.js": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-			"dev": true,
-			"requires": {
-				"hash-base": "^3.0.0",
+		"node_modules/des.js": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+			"integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+			"license": "MIT",
+			"dependencies": {
 				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
+				"minimalistic-assert": "^1.0.0"
 			}
 		},
-		"mdn-data": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-			"integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-			"dev": true
-		},
-		"media-typer": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-			"dev": true
+		"node_modules/destroy": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
+			}
 		},
-		"mem": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-			"integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+		"node_modules/detect-libc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
 			"dev": true,
-			"requires": {
-				"map-age-cleaner": "^0.1.1",
-				"mimic-fn": "^2.0.0",
-				"p-is-promise": "^2.0.0"
+			"license": "Apache-2.0",
+			"optional": true,
+			"bin": {
+				"detect-libc": "bin/detect-libc.js"
 			},
-			"dependencies": {
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.10"
 			}
 		},
-		"memory-fs": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-			"integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==",
+		"node_modules/detect-node": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
 			"dev": true,
-			"requires": {
-				"errno": "^0.1.3",
-				"readable-stream": "^2.0.1"
-			}
+			"license": "MIT"
 		},
-		"merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-			"dev": true
+		"node_modules/dfa": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz",
+			"integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==",
+			"license": "MIT"
 		},
-		"merge-source-map": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-			"integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-			"requires": {
-				"source-map": "^0.6.1"
+		"node_modules/diff": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+			"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.3.1"
 			}
 		},
-		"merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"dev": true
-		},
-		"merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true
-		},
-		"methods": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-			"dev": true
+		"node_modules/diffie-hellman": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+			"license": "MIT",
+			"dependencies": {
+				"bn.js": "^4.1.0",
+				"miller-rabin": "^4.0.0",
+				"randombytes": "^2.0.0"
+			}
 		},
-		"micromatch": {
-			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+		"node_modules/diffie-hellman/node_modules/bn.js": {
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"license": "MIT"
+		},
+		"node_modules/dir-glob": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+			"integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
 			"dev": true,
-			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"braces": "^2.3.1",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"extglob": "^2.0.4",
-				"fragment-cache": "^0.2.1",
-				"kind-of": "^6.0.2",
-				"nanomatch": "^1.2.9",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.2"
+			"license": "MIT",
+			"dependencies": {
+				"path-type": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"miller-rabin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+		"node_modules/dns-equal": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
 			"dev": true,
-			"requires": {
-				"bn.js": "^4.0.0",
-				"brorand": "^1.0.1"
-			},
+			"license": "MIT"
+		},
+		"node_modules/dns-packet": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+			"integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
+				"ip": "^1.1.0",
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"mime": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-			"integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-			"dev": true
-		},
-		"mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"dev": true
+		"node_modules/dns-txt": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+			"integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"buffer-indexof": "^1.0.0"
+			}
 		},
-		"mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+		"node_modules/doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
 			"dev": true,
-			"requires": {
-				"mime-db": "1.52.0"
+			"license": "Apache-2.0",
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"mimic-fn": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-			"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-			"dev": true
+		"node_modules/dom-converter": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+			"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"utila": "~0.4"
+			}
 		},
-		"mimic-response": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-			"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+		"node_modules/dom-event-types": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/dom-event-types/-/dom-event-types-1.1.0.tgz",
+			"integrity": "sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==",
 			"dev": true,
-			"optional": true
+			"license": "MIT"
 		},
-		"mini-css-extract-plugin": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
-			"integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+		"node_modules/dom-serializer": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
 			"dev": true,
-			"requires": {
-				"loader-utils": "^1.1.0",
-				"normalize-url": "1.9.1",
-				"schema-utils": "^1.0.0",
-				"webpack-sources": "^1.1.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"normalize-url": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-					"integrity": "sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==",
-					"dev": true,
-					"requires": {
-						"object-assign": "^4.0.1",
-						"prepend-http": "^1.0.0",
-						"query-string": "^4.1.0",
-						"sort-keys": "^1.0.0"
-					}
-				},
-				"schema-utils": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
-					}
-				}
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
 			}
 		},
-		"minimalistic-assert": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-			"dev": true
+		"node_modules/domain-browser": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+			"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.4",
+				"npm": ">=1.2"
+			}
 		},
-		"minimalistic-crypto-utils": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-			"integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-			"dev": true
+		"node_modules/domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			],
+			"license": "BSD-2-Clause"
 		},
-		"minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+		"node_modules/domexception": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+			"integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+			"deprecated": "Use your platform's native DOMException instead",
 			"dev": true,
-			"requires": {
-				"brace-expansion": "^1.1.7"
+			"license": "MIT",
+			"dependencies": {
+				"webidl-conversions": "^4.0.2"
 			}
 		},
-		"minimist": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-			"integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
+		"node_modules/domhandler": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"domelementtype": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
 		},
-		"minipass": {
-			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-			"integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+		"node_modules/domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
 			"dev": true,
-			"requires": {
-				"yallist": "^4.0.0"
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
 			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/dot-object": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/dot-object/-/dot-object-1.9.0.tgz",
+			"integrity": "sha512-7MPN6y7XhAO4vM4eguj5+5HNKLjJYfkVG1ZR1Aput4Q4TR6SYeSjhpVQ77IzJHoSHffKbDxBC+48aCiiRurDPw==",
+			"dev": true,
 			"dependencies": {
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
+				"commander": "^2.20.0",
+				"glob": "^7.1.4"
+			},
+			"bin": {
+				"dot-object": "bin/dot-object"
 			}
 		},
-		"minipass-collect": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-			"integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+		"node_modules/dot-object/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
 			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
+			"license": "MIT"
+		},
+		"node_modules/dot-prop": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-obj": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"minipass-flush": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-			"integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+		"node_modules/dotenv": {
+			"version": "8.6.0",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+			"integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
 			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"minipass-pipeline": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-			"integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+		"node_modules/dotenv-expand": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+			"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
 			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
+			"license": "BSD-2-Clause"
+		},
+		"node_modules/drag-tracker": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/drag-tracker/-/drag-tracker-1.0.0.tgz",
+			"integrity": "sha512-BSGDl37YXpW49dLMRfiDExxzD3yPOpLEBGx05Wed3z2sk2+Qd5dFvHCSVFTPsGTeltGBtkRB4qhLhSKv6tvBKw==",
+			"license": "MIT"
+		},
+		"node_modules/duplexer": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/duplexify": {
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+			"license": "MIT",
+			"dependencies": {
+				"end-of-stream": "^1.0.0",
+				"inherits": "^2.0.1",
+				"readable-stream": "^2.0.0",
+				"stream-shift": "^1.0.0"
 			}
 		},
-		"mississippi": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-			"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+		"node_modules/eastasianwidth": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+			"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
 			"dev": true,
-			"requires": {
-				"concat-stream": "^1.5.0",
-				"duplexify": "^3.4.2",
-				"end-of-stream": "^1.1.0",
-				"flush-write-stream": "^1.0.0",
-				"from2": "^2.1.0",
-				"parallel-transform": "^1.1.0",
-				"pump": "^3.0.0",
-				"pumpify": "^1.3.3",
-				"stream-each": "^1.1.0",
-				"through2": "^2.0.0"
+			"license": "MIT"
+		},
+		"node_modules/easy-stack": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz",
+			"integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"mixin-deep": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+		"node_modules/ecc-jsbn": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+			"integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
 			"dev": true,
-			"requires": {
-				"for-in": "^1.0.2",
-				"is-extendable": "^1.0.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
+				"jsbn": "~0.1.0",
+				"safer-buffer": "^2.1.0"
 			}
 		},
-		"mkdirp": {
-			"version": "0.5.6",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+		"node_modules/editorconfig": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
+			"integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==",
 			"dev": true,
-			"requires": {
-				"minimist": "^1.2.6"
+			"license": "MIT",
+			"dependencies": {
+				"@one-ini/wasm": "0.1.1",
+				"commander": "^10.0.0",
+				"minimatch": "9.0.1",
+				"semver": "^7.5.3"
+			},
+			"bin": {
+				"editorconfig": "bin/editorconfig"
+			},
+			"engines": {
+				"node": ">=14"
 			}
 		},
-		"mkdirp-classic": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+		"node_modules/editorconfig/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"dev": true,
-			"optional": true
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
 		},
-		"mobius1-selectr": {
-			"version": "2.4.10",
-			"resolved": "https://registry.npmjs.org/mobius1-selectr/-/mobius1-selectr-2.4.10.tgz",
-			"integrity": "sha512-U/pQ8jZwO7z3Mf9OYzJR6AKfleF5jSBIueKKxGMr/tgyLuTWgchgFyeaXpAIz3Cbp+7eIN1hw5D2gxc4cNnOkQ=="
+		"node_modules/editorconfig/node_modules/commander": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+			"integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=14"
+			}
 		},
-		"mocha": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-			"integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+		"node_modules/editorconfig/node_modules/minimatch": {
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+			"integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
 			"dev": true,
-			"requires": {
-				"browser-stdout": "1.3.1",
-				"commander": "2.15.1",
-				"debug": "3.1.0",
-				"diff": "3.5.0",
-				"escape-string-regexp": "1.0.5",
-				"glob": "7.1.2",
-				"growl": "1.10.5",
-				"he": "1.1.1",
-				"minimatch": "3.0.4",
-				"mkdirp": "0.5.1",
-				"supports-color": "5.4.0"
-			},
+			"license": "ISC",
 			"dependencies": {
-				"commander": {
-					"version": "2.15.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-					"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-					"dev": true
-				},
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"diff": {
-					"version": "3.5.0",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-					"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-					"dev": true
-				},
-				"glob": {
-					"version": "7.1.2",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-					"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.4.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-					"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
-			}
-		},
-		"mocha-junit-reporter": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.0.0.tgz",
-			"integrity": "sha512-20HoWh2HEfhqmigfXOKUhZQyX23JImskc37ZOhIjBKoBEsb+4cAFRJpAVhFpnvsztLklW/gFVzsrobjLwmX4lA==",
-			"dev": true,
-			"requires": {
-				"debug": "^2.2.0",
-				"md5": "^2.1.0",
-				"mkdirp": "~0.5.1",
-				"strip-ansi": "^4.0.0",
-				"xml": "^1.0.0"
+				"brace-expansion": "^2.0.1"
 			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"mocha-webpack": {
-			"version": "2.0.0-beta.0",
-			"resolved": "https://registry.npmjs.org/mocha-webpack/-/mocha-webpack-2.0.0-beta.0.tgz",
-			"integrity": "sha512-2ezbW0h5cYWr874F/hzytQCqINxk+GVelMY4xWTSHwwH1LrPAOzjlUljZ+/PhpaP6QeqYbL5x5vK/bnaXqkfEw==",
+		"node_modules/editorconfig/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"dev": true,
-			"requires": {
-				"babel-runtime": "^6.18.0",
-				"chalk": "^2.3.0",
-				"chokidar": "^2.0.2",
-				"glob-parent": "^3.1.0",
-				"globby": "^7.1.1",
-				"interpret": "^1.0.1",
-				"is-glob": "^4.0.0",
-				"loader-utils": "^1.1.0",
-				"lodash": "^4.3.0",
-				"memory-fs": "^0.4.1",
-				"nodent-runtime": "^3.0.3",
-				"normalize-path": "^2.0.1",
-				"progress": "^2.0.0",
-				"source-map-support": "^0.5.0",
-				"strip-ansi": "^4.0.0",
-				"toposort": "^1.0.0",
-				"yargs": "^11.0.0"
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
 			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"anymatch": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^3.1.4",
-						"normalize-path": "^2.1.1"
-					}
-				},
-				"binary-extensions": {
-					"version": "1.13.1",
-					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-					"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-					"dev": true
-				},
-				"chokidar": {
-					"version": "2.1.8",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.1",
-						"braces": "^2.3.2",
-						"fsevents": "^1.2.7",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.3",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"normalize-path": "^3.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.2.1",
-						"upath": "^1.1.1"
-					},
-					"dependencies": {
-						"normalize-path": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-							"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-							"dev": true
-						}
-					}
-				},
-				"fsevents": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"bindings": "^1.5.0",
-						"nan": "^2.12.1"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-							"dev": true,
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				},
-				"globby": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-					"integrity": "sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "^2.0.0",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
-					}
-				},
-				"is-binary-path": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-					"integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-					"dev": true,
-					"requires": {
-						"binary-extensions": "^1.0.0"
-					}
-				},
-				"normalize-path": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-					"integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-					"dev": true,
-					"requires": {
-						"remove-trailing-separator": "^1.0.1"
-					}
-				},
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-					"dev": true
-				},
-				"readdirp": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-					"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.11",
-						"micromatch": "^3.1.10",
-						"readable-stream": "^2.0.2"
-					}
-				},
-				"slash": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-					"integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"moment": {
-			"version": "2.22.2",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
-			"integrity": "sha512-LRvkBHaJGnrcWvqsElsOhHCzj8mU39wLx5pQ0pc6s153GynCTsPdGdqsVNKAQD9sKnWj11iF7TZx9fpLwdD3fw=="
-		},
-		"move-concurrently": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-			"integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==",
+		"node_modules/ee-first": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
 			"dev": true,
-			"requires": {
-				"aproba": "^1.1.1",
-				"copy-concurrently": "^1.0.0",
-				"fs-write-stream-atomic": "^1.0.8",
-				"mkdirp": "^0.5.1",
-				"rimraf": "^2.5.4",
-				"run-queue": "^1.0.3"
-			}
-		},
-		"ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+			"license": "MIT"
 		},
-		"multicast-dns": {
-			"version": "6.2.3",
-			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-			"integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+		"node_modules/ejs": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
+			"integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
 			"dev": true,
-			"requires": {
-				"dns-packet": "^1.3.1",
-				"thunky": "^1.0.2"
+			"hasInstallScript": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"multicast-dns-service-types": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-			"integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==",
-			"dev": true
-		},
-		"mute-stream": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-			"integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==",
-			"dev": true
+		"node_modules/electron-to-chromium": {
+			"version": "1.5.25",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz",
+			"integrity": "sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g==",
+			"dev": true,
+			"license": "ISC"
 		},
-		"mz": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-			"integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+		"node_modules/elegant-spinner": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
+			"integrity": "sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ==",
 			"dev": true,
-			"requires": {
-				"any-promise": "^1.0.0",
-				"object-assign": "^4.0.1",
-				"thenify-all": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"nan": {
-			"version": "2.17.0",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-			"integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
-			"dev": true,
-			"optional": true
+		"node_modules/elliptic": {
+			"version": "6.5.7",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
+			"integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
+			"license": "MIT",
+			"dependencies": {
+				"bn.js": "^4.11.9",
+				"brorand": "^1.1.0",
+				"hash.js": "^1.0.0",
+				"hmac-drbg": "^1.0.1",
+				"inherits": "^2.0.4",
+				"minimalistic-assert": "^1.0.1",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
 		},
-		"nanoid": {
-			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-			"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+		"node_modules/elliptic/node_modules/bn.js": {
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"license": "MIT"
 		},
-		"nanomatch": {
-			"version": "1.2.13",
-			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 			"dev": true,
-			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"fragment-cache": "^0.2.1",
-				"is-windows": "^1.0.2",
-				"kind-of": "^6.0.2",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
+			"license": "MIT"
+		},
+		"node_modules/emojis-list": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4"
 			}
 		},
-		"napi-build-utils": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-			"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+		"node_modules/encodeurl": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+			"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
 			"dev": true,
-			"optional": true
-		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true
-		},
-		"negotiator": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-			"dev": true
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"neo-async": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-			"dev": true
+		"node_modules/end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"license": "MIT",
+			"dependencies": {
+				"once": "^1.4.0"
+			}
 		},
-		"nice-try": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-			"dev": true
+		"node_modules/enhanced-resolve": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+			"integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"memory-fs": "^0.5.0",
+				"tapable": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"nise": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz",
-			"integrity": "sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==",
-			"requires": {
-				"@sinonjs/commons": "^1.8.3",
-				"@sinonjs/fake-timers": ">=5",
-				"@sinonjs/text-encoding": "^0.7.1",
-				"just-extend": "^4.0.2",
-				"path-to-regexp": "^1.7.0"
+		"node_modules/enhanced-resolve/node_modules/memory-fs": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+			"integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+			"license": "MIT",
+			"dependencies": {
+				"errno": "^0.1.3",
+				"readable-stream": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=4.3.0 <5.0.0 || >=5.10"
 			}
 		},
-		"no-case": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-			"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+		"node_modules/enquirer": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+			"integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
 			"dev": true,
-			"requires": {
-				"lower-case": "^1.1.1"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-colors": "^4.1.1",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"node-abi": {
-			"version": "2.30.1",
-			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
-			"integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
+		"node_modules/entities": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"semver": "^5.4.1"
-			},
+			"license": "BSD-2-Clause",
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/errno": {
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+			"integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+			"license": "MIT",
 			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true,
-					"optional": true
-				}
+				"prr": "~1.0.1"
+			},
+			"bin": {
+				"errno": "cli.js"
 			}
 		},
-		"node-addon-api": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
 			"dev": true,
-			"optional": true
-		},
-		"node-forge": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-			"integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
-			"dev": true
+			"license": "MIT",
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
 		},
-		"node-ipc": {
-			"version": "9.2.1",
-			"resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.2.1.tgz",
-			"integrity": "sha512-mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ==",
+		"node_modules/error-stack-parser": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+			"integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
 			"dev": true,
-			"requires": {
-				"event-pubsub": "4.3.0",
-				"js-message": "1.0.7",
-				"js-queue": "2.0.2"
+			"license": "MIT",
+			"dependencies": {
+				"stackframe": "^1.3.4"
 			}
 		},
-		"node-libs-browser": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-			"integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+		"node_modules/es-abstract": {
+			"version": "1.23.3",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+			"integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
 			"dev": true,
-			"requires": {
-				"assert": "^1.1.1",
-				"browserify-zlib": "^0.2.0",
-				"buffer": "^4.3.0",
-				"console-browserify": "^1.1.0",
-				"constants-browserify": "^1.0.0",
-				"crypto-browserify": "^3.11.0",
-				"domain-browser": "^1.1.1",
-				"events": "^3.0.0",
-				"https-browserify": "^1.0.0",
-				"os-browserify": "^0.3.0",
-				"path-browserify": "0.0.1",
-				"process": "^0.11.10",
-				"punycode": "^1.2.4",
-				"querystring-es3": "^0.2.0",
-				"readable-stream": "^2.3.3",
-				"stream-browserify": "^2.0.1",
-				"stream-http": "^2.7.2",
-				"string_decoder": "^1.0.0",
-				"timers-browserify": "^2.0.4",
-				"tty-browserify": "0.0.0",
-				"url": "^0.11.0",
-				"util": "^0.11.0",
-				"vm-browserify": "^1.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"array-buffer-byte-length": "^1.0.1",
+				"arraybuffer.prototype.slice": "^1.0.3",
+				"available-typed-arrays": "^1.0.7",
+				"call-bind": "^1.0.7",
+				"data-view-buffer": "^1.0.1",
+				"data-view-byte-length": "^1.0.1",
+				"data-view-byte-offset": "^1.0.0",
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.0.0",
+				"es-set-tostringtag": "^2.0.3",
+				"es-to-primitive": "^1.2.1",
+				"function.prototype.name": "^1.1.6",
+				"get-intrinsic": "^1.2.4",
+				"get-symbol-description": "^1.0.2",
+				"globalthis": "^1.0.3",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.2",
+				"has-proto": "^1.0.3",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.2",
+				"internal-slot": "^1.0.7",
+				"is-array-buffer": "^3.0.4",
+				"is-callable": "^1.2.7",
+				"is-data-view": "^1.0.1",
+				"is-negative-zero": "^2.0.3",
+				"is-regex": "^1.1.4",
+				"is-shared-array-buffer": "^1.0.3",
+				"is-string": "^1.0.7",
+				"is-typed-array": "^1.1.13",
+				"is-weakref": "^1.0.2",
+				"object-inspect": "^1.13.1",
+				"object-keys": "^1.1.1",
+				"object.assign": "^4.1.5",
+				"regexp.prototype.flags": "^1.5.2",
+				"safe-array-concat": "^1.1.2",
+				"safe-regex-test": "^1.0.3",
+				"string.prototype.trim": "^1.2.9",
+				"string.prototype.trimend": "^1.0.8",
+				"string.prototype.trimstart": "^1.0.8",
+				"typed-array-buffer": "^1.0.2",
+				"typed-array-byte-length": "^1.0.1",
+				"typed-array-byte-offset": "^1.0.2",
+				"typed-array-length": "^1.0.6",
+				"unbox-primitive": "^1.0.2",
+				"which-typed-array": "^1.1.15"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/es-array-method-boxes-properly": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+			"integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/es-define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+			"license": "MIT",
 			"dependencies": {
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-					"dev": true
-				},
-				"punycode": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-					"dev": true
-				},
-				"util": {
-					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-					"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-					"dev": true,
-					"requires": {
-						"inherits": "2.0.3"
-					}
-				}
+				"get-intrinsic": "^1.2.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
-		"node-releases": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-			"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
-			"dev": true
+		"node_modules/es-errors": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"nodent-runtime": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/nodent-runtime/-/nodent-runtime-3.2.1.tgz",
-			"integrity": "sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==",
-			"dev": true
+		"node_modules/es-get-iterator": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+			"integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.1.3",
+				"has-symbols": "^1.0.3",
+				"is-arguments": "^1.1.1",
+				"is-map": "^2.0.2",
+				"is-set": "^2.0.2",
+				"is-string": "^1.0.7",
+				"isarray": "^2.0.5",
+				"stop-iteration-iterator": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"noop-logger": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
-			"integrity": "sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ==",
+		"node_modules/es-object-atoms": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+			"integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
 			"dev": true,
-			"optional": true
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"nopt": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-			"integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
+		"node_modules/es-set-tostringtag": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+			"integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
 			"dev": true,
-			"requires": {
-				"abbrev": "^1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"get-intrinsic": "^1.2.4",
+				"has-tostringtag": "^1.0.2",
+				"hasown": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
-		"normalize-package-data": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+		"node_modules/es-to-primitive": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
 			"dev": true,
-			"requires": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				}
+				"is-callable": "^1.1.4",
+				"is-date-object": "^1.0.1",
+				"is-symbol": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+		"node_modules/es6-object-assign": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
+			"integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
+			"license": "MIT"
 		},
-		"normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-			"dev": true
+		"node_modules/escalade": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"normalize-url": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-			"integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-			"dev": true
+		"node_modules/escape-html": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"npm-run-path": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-			"integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+		"node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
 			"dev": true,
-			"requires": {
-				"path-key": "^2.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"npmlog": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+		"node_modules/escodegen": {
+			"version": "1.14.3",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+			"integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"are-we-there-yet": "~1.1.2",
-				"console-control-strings": "~1.1.0",
-				"gauge": "~2.7.3",
-				"set-blocking": "~2.0.0"
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esprima": "^4.0.1",
+				"estraverse": "^4.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1"
+			},
+			"bin": {
+				"escodegen": "bin/escodegen.js",
+				"esgenerate": "bin/esgenerate.js"
+			},
+			"engines": {
+				"node": ">=4.0"
+			},
+			"optionalDependencies": {
+				"source-map": "~0.6.1"
 			}
 		},
-		"nth-check": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-			"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+		"node_modules/eslint": {
+			"version": "5.16.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+			"integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
 			"dev": true,
-			"requires": {
-				"boolbase": "~1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"ajv": "^6.9.1",
+				"chalk": "^2.1.0",
+				"cross-spawn": "^6.0.5",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"eslint-scope": "^4.0.3",
+				"eslint-utils": "^1.3.1",
+				"eslint-visitor-keys": "^1.0.0",
+				"espree": "^5.0.1",
+				"esquery": "^1.0.1",
+				"esutils": "^2.0.2",
+				"file-entry-cache": "^5.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob": "^7.1.2",
+				"globals": "^11.7.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"inquirer": "^6.2.2",
+				"js-yaml": "^3.13.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.3.0",
+				"lodash": "^4.17.11",
+				"minimatch": "^3.0.4",
+				"mkdirp": "^0.5.1",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.8.2",
+				"path-is-inside": "^1.0.2",
+				"progress": "^2.0.0",
+				"regexpp": "^2.0.1",
+				"semver": "^5.5.1",
+				"strip-ansi": "^4.0.0",
+				"strip-json-comments": "^2.0.1",
+				"table": "^5.2.3",
+				"text-table": "^0.2.0"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^6.14.0 || ^8.10.0 || >=9.10.0"
 			}
 		},
-		"null-loader": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/null-loader/-/null-loader-3.0.0.tgz",
-			"integrity": "sha512-hf5sNLl8xdRho4UPBOOeoIwT3WhjYcMUQm0zj44EhD6UscMAz72o2udpoDFBgykucdEDGIcd6SXbc/G6zssbzw==",
+		"node_modules/eslint-loader": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz",
+			"integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==",
+			"deprecated": "This loader has been deprecated. Please use eslint-webpack-plugin",
 			"dev": true,
-			"requires": {
-				"loader-utils": "^1.2.3",
-				"schema-utils": "^1.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"schema-utils": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
-					}
-				}
+				"loader-fs-cache": "^1.0.0",
+				"loader-utils": "^1.0.2",
+				"object-assign": "^4.0.1",
+				"object-hash": "^1.1.4",
+				"rimraf": "^2.6.1"
+			},
+			"peerDependencies": {
+				"eslint": ">=1.6.0 <7.0.0",
+				"webpack": ">=2.0.0 <5.0.0"
 			}
 		},
-		"num2fraction": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-			"integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
-			"dev": true
-		},
-		"number-is-nan": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
-			"dev": true
-		},
-		"nwsapi": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-			"integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==",
-			"dev": true
-		},
-		"oauth-sign": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-			"dev": true
-		},
-		"object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-			"dev": true
-		},
-		"object-copy": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-			"integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+		"node_modules/eslint-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
 			"dev": true,
-			"requires": {
-				"copy-descriptor": "^0.1.0",
-				"define-property": "^0.2.5",
-				"kind-of": "^3.0.3"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"object-hash": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
-			"integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
-			"dev": true
-		},
-		"object-inspect": {
-			"version": "1.12.2",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-			"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
-		},
-		"object-is": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3"
+		"node_modules/eslint-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-		},
-		"object-visit": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-			"integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+		"node_modules/eslint-plugin-cypress": {
+			"version": "2.15.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.2.tgz",
+			"integrity": "sha512-CtcFEQTDKyftpI22FVGpx8bkpKyYXBlNge6zSo0pl5/qJvBAnzaD76Vu2AsP16d6mTj478Ldn2mhgrWV+Xr0vQ==",
 			"dev": true,
-			"requires": {
-				"isobject": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"globals": "^13.20.0"
+			},
+			"peerDependencies": {
+				"eslint": ">= 3.2.1"
 			}
 		},
-		"object.assign": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"has-symbols": "^1.0.3",
-				"object-keys": "^1.1.1"
+		"node_modules/eslint-plugin-cypress/node_modules/globals": {
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"object.getownpropertydescriptors": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz",
-			"integrity": "sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==",
+		"node_modules/eslint-plugin-cypress/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
 			"dev": true,
-			"requires": {
-				"array.prototype.reduce": "^1.0.4",
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.1"
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"object.pick": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-			"integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+		"node_modules/eslint-plugin-vue": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0.tgz",
+			"integrity": "sha512-mSv2Ebz3RaPP+XJO/mu7F+SdR9lrMyGISSExnarLFqqf3pF5wTmwWNrhHW1o9zKzKI811UVTIIkWJJvgO6SsUQ==",
 			"dev": true,
-			"requires": {
-				"isobject": "^3.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"vue-eslint-parser": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=6.5"
+			},
+			"peerDependencies": {
+				"eslint": "^5.0.0"
 			}
 		},
-		"object.values": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-			"integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+		"node_modules/eslint-scope": {
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+			"integrity": "sha512-ivpbtpUgg9SJS4TLjK7KdcDhqc/E3CGItsvQbBNLkNGUeMhd5qnJcryba/brESS+dg3vrLqPuc/UcS7jRJdN5A==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esrecurse": "^4.1.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"obuf": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-			"dev": true
-		},
-		"on-finished": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+		"node_modules/eslint-utils": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+			"integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
 			"dev": true,
-			"requires": {
-				"ee-first": "1.1.1"
+			"license": "MIT",
+			"dependencies": {
+				"eslint-visitor-keys": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"on-headers": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-			"dev": true
-		},
-		"once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+		"node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
 			"dev": true,
-			"requires": {
-				"wrappy": "1"
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"onetime": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-			"integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
+		"node_modules/eslint/node_modules/ansi-regex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+			"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
 			"dev": true,
-			"requires": {
-				"mimic-fn": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"open": {
-			"version": "6.4.0",
-			"resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-			"integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+		"node_modules/eslint/node_modules/eslint-scope": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
 			"dev": true,
-			"requires": {
-				"is-wsl": "^1.1.0"
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esrecurse": "^4.1.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"opener": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-			"dev": true
-		},
-		"opn": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-			"integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+		"node_modules/eslint/node_modules/import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
 			"dev": true,
-			"requires": {
-				"is-wsl": "^1.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"optionator": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+		"node_modules/eslint/node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
 			"dev": true,
-			"requires": {
-				"deep-is": "~0.1.3",
-				"fast-levenshtein": "~2.0.6",
-				"levn": "~0.3.0",
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2",
-				"word-wrap": "~1.2.3"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"ora": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
-			"integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
+		"node_modules/eslint/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
 			"dev": true,
-			"requires": {
-				"chalk": "^2.4.2",
-				"cli-cursor": "^2.1.0",
-				"cli-spinners": "^2.0.0",
-				"log-symbols": "^2.2.0",
-				"strip-ansi": "^5.2.0",
-				"wcwidth": "^1.0.1"
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver"
 			}
 		},
-		"os-browserify": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-			"integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-			"dev": true
-		},
-		"os-homedir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-			"dev": true
-		},
-		"os-locale": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-			"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+		"node_modules/eslint/node_modules/strip-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
 			"dev": true,
-			"requires": {
-				"execa": "^1.0.0",
-				"lcid": "^2.0.0",
-				"mem": "^4.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"os-tmpdir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-			"dev": true
-		},
-		"p-defer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-			"integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
-			"dev": true
-		},
-		"p-finally": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-			"integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
-			"dev": true
-		},
-		"p-is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-			"integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-			"dev": true
+		"node_modules/esm": {
+			"version": "3.2.25",
+			"resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
+			"integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"p-limit": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-			"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+		"node_modules/espree": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+			"integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
 			"dev": true,
-			"requires": {
-				"p-try": "^1.0.0"
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"acorn": "^6.0.7",
+				"acorn-jsx": "^5.0.0",
+				"eslint-visitor-keys": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"p-locate": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-			"integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
+		"node_modules/espree/node_modules/acorn": {
+			"version": "6.4.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
 			"dev": true,
-			"requires": {
-				"p-limit": "^1.1.0"
+			"license": "MIT",
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
 			}
 		},
-		"p-map": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-			"dev": true
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"p-retry": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-			"integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+		"node_modules/esquery": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
 			"dev": true,
-			"requires": {
-				"retry": "^0.12.0"
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
 			}
 		},
-		"p-try": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-			"integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
-			"dev": true
+		"node_modules/esquery/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=4.0"
+			}
 		},
-		"pako": {
-			"version": "0.2.9",
-			"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-			"integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
 		},
-		"parallel-transform": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-			"integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-			"dev": true,
-			"requires": {
-				"cyclist": "^1.0.1",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.1.5"
+		"node_modules/esrecurse/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=4.0"
 			}
 		},
-		"param-case": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-			"integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==",
-			"dev": true,
-			"requires": {
-				"no-case": "^2.2.0"
+		"node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=4.0"
 			}
 		},
-		"parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
 			"dev": true,
-			"requires": {
-				"callsites": "^3.0.0"
-			},
-			"dependencies": {
-				"callsites": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-					"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-					"dev": true
-				}
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"parse-asn1": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+		"node_modules/etag": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
 			"dev": true,
-			"requires": {
-				"asn1.js": "^5.2.0",
-				"browserify-aes": "^1.0.0",
-				"evp_bytestokey": "^1.0.0",
-				"pbkdf2": "^3.0.3",
-				"safe-buffer": "^5.1.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+		"node_modules/event-pubsub": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
+			"integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==",
 			"dev": true,
-			"requires": {
-				"error-ex": "^1.3.1",
-				"json-parse-better-errors": "^1.0.1"
+			"license": "Unlicense",
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"parse5": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-			"integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
-			"dev": true
+		"node_modules/eventemitter2": {
+			"version": "6.4.7",
+			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
+			"integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"parse5-htmlparser2-tree-adapter": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-			"integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+		"node_modules/eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
 			"dev": true,
-			"requires": {
-				"parse5": "^6.0.1"
-			},
-			"dependencies": {
-				"parse5": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-					"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-					"dev": true
-				}
+			"license": "MIT"
+		},
+		"node_modules/events": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.x"
 			}
 		},
-		"parseurl": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-			"dev": true
-		},
-		"pascalcase": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-			"integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-			"dev": true
-		},
-		"path-browserify": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-			"integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-			"dev": true
-		},
-		"path-dirname": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-			"integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
-			"dev": true
-		},
-		"path-exists": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-			"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-			"dev": true
-		},
-		"path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-			"dev": true
-		},
-		"path-is-inside": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-			"dev": true
-		},
-		"path-key": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-			"integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-			"dev": true
-		},
-		"path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+		"node_modules/eventsource": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz",
+			"integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.12.0"
+			}
 		},
-		"path-to-regexp": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-			"requires": {
-				"isarray": "0.0.1"
-			},
+		"node_modules/evp_bytestokey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"license": "MIT",
 			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-				}
+				"md5.js": "^1.3.4",
+				"safe-buffer": "^5.1.1"
 			}
 		},
-		"path-type": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-			"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+		"node_modules/execa": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
 			"dev": true,
-			"requires": {
-				"pify": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^4.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
 			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/executable": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+			"integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-					"dev": true
-				}
+				"pify": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"pathval": {
+		"node_modules/exit-hook": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-			"integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-			"dev": true
-		},
-		"pbkdf2": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+			"resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+			"integrity": "sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==",
 			"dev": true,
-			"requires": {
-				"create-hash": "^1.1.2",
-				"create-hmac": "^1.1.4",
-				"ripemd160": "^2.0.1",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"pdfkit": {
-			"version": "0.12.3",
-			"resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.12.3.tgz",
-			"integrity": "sha512-+qDLgm2yq6WOKcxTb43lDeo3EtMIDQs0CK1RNqhHC9iT6u0KOmgwAClkYh9xFw2ATbmUZzt4f7KMwDCOfPDluA==",
-			"requires": {
-				"crypto-js": "^4.0.0",
-				"fontkit": "^1.8.1",
-				"linebreak": "^1.0.2",
-				"png-js": "^1.0.0"
+		"node_modules/exit-on-epipe": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+			"integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"pdfmake": {
-			"version": "0.1.72",
-			"resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.1.72.tgz",
-			"integrity": "sha512-xZrPS+Safjf1I8ZYtMoXX83E6C6Pd1zFwa168yNTeeJWHclqf1z9DoYajjlY2uviN7gGyxwVZeou39uSk1oh1g==",
-			"requires": {
-				"iconv-lite": "^0.6.2",
-				"linebreak": "^1.0.2",
-				"pdfkit": "^0.12.0",
-				"svg-to-pdfkit": "^0.1.8",
-				"xmldoc": "^1.1.2"
+		"node_modules/expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"pend": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-			"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-			"dev": true
-		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+		"node_modules/expand-brackets/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
 		},
-		"picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+		"node_modules/expand-brackets/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"license": "MIT",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"dev": true
+		"node_modules/expand-brackets/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"license": "MIT",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"picomodal": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/picomodal/-/picomodal-3.0.0.tgz",
-			"integrity": "sha512-FoR3TDfuLlqUvcEeK5ifpKSVVns6B4BQvc8SDF6THVMuadya6LLtji0QgUDSStw0ZR2J7I6UGi5V2V23rnPWTw=="
+		"node_modules/expand-brackets/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"license": "MIT",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"pify": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-			"dev": true
+		"node_modules/expand-brackets/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"pinkie": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-			"integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-			"dev": true
+		"node_modules/expand-brackets/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
-		"pinkie-promise": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-			"integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+		"node_modules/expand-template": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
 			"dev": true,
-			"requires": {
-				"pinkie": "^2.0.0"
+			"license": "(MIT OR WTFPL)",
+			"optional": true,
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+		"node_modules/express": {
+			"version": "4.21.0",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
+			"integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
 			"dev": true,
-			"requires": {
-				"find-up": "^4.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				}
+				"accepts": "~1.3.8",
+				"array-flatten": "1.1.1",
+				"body-parser": "1.20.3",
+				"content-disposition": "0.5.4",
+				"content-type": "~1.0.4",
+				"cookie": "0.6.0",
+				"cookie-signature": "1.0.6",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"encodeurl": "~2.0.0",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "1.3.1",
+				"fresh": "0.5.2",
+				"http-errors": "2.0.0",
+				"merge-descriptors": "1.0.3",
+				"methods": "~1.1.2",
+				"on-finished": "2.4.1",
+				"parseurl": "~1.3.3",
+				"path-to-regexp": "0.1.10",
+				"proxy-addr": "~2.0.7",
+				"qs": "6.13.0",
+				"range-parser": "~1.2.1",
+				"safe-buffer": "5.2.1",
+				"send": "0.19.0",
+				"serve-static": "1.16.2",
+				"setprototypeof": "1.2.0",
+				"statuses": "2.0.1",
+				"type-is": "~1.6.18",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
 			}
 		},
-		"pkg-up": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-			"integrity": "sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==",
+		"node_modules/express/node_modules/cookie": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+			"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
 			"dev": true,
-			"requires": {
-				"find-up": "^2.1.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"pluralize": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-			"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+		"node_modules/express/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"dev": true,
-			"optional": true
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
 		},
-		"pn": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-			"integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-			"dev": true
+		"node_modules/express/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"png-js": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/png-js/-/png-js-1.0.0.tgz",
-			"integrity": "sha512-k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g=="
+		"node_modules/express/node_modules/path-to-regexp": {
+			"version": "0.1.10",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+			"integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"pnp-webpack-plugin": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz",
-			"integrity": "sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==",
+		"node_modules/extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
 			"dev": true,
-			"requires": {
-				"ts-pnp": "^1.1.6"
-			}
+			"license": "MIT"
 		},
-		"polylabel": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/polylabel/-/polylabel-1.1.0.tgz",
-			"integrity": "sha512-bxaGcA40sL3d6M4hH72Z4NdLqxpXRsCFk8AITYg6x1rn1Ei3izf00UMLklerBZTO49aPA3CYrIwVulx2Bce2pA==",
-			"requires": {
-				"tinyqueue": "^2.0.3"
+		"node_modules/extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+			"license": "MIT",
+			"dependencies": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"portfinder": {
-			"version": "1.0.32",
-			"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
-			"integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
+		"node_modules/external-editor": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+			"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
 			"dev": true,
-			"requires": {
-				"async": "^2.6.4",
-				"debug": "^3.2.7",
-				"mkdirp": "^0.5.6"
+			"license": "MIT",
+			"dependencies": {
+				"chardet": "^0.7.0",
+				"iconv-lite": "^0.4.24",
+				"tmp": "^0.0.33"
 			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/external-editor/node_modules/tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"async": {
-					"version": "2.6.4",
-					"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-					"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-					"dev": true,
-					"requires": {
-						"lodash": "^4.17.14"
-					}
-				}
+				"os-tmpdir": "~1.0.2"
+			},
+			"engines": {
+				"node": ">=0.6.0"
 			}
 		},
-		"posix-character-classes": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-			"integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-			"dev": true
-		},
-		"postcss": {
-			"version": "8.4.18",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-			"integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
-			"requires": {
-				"nanoid": "^3.3.4",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
+		"node_modules/extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"license": "MIT",
+			"dependencies": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"postcss-calc": {
-			"version": "7.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-			"integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
-			"dev": true,
-			"requires": {
-				"postcss": "^7.0.27",
-				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.0.2"
+		"node_modules/extglob/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"license": "MIT",
+			"dependencies": {
+				"is-descriptor": "^1.0.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/extglob/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"postcss-colormin": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-			"integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+		"node_modules/extglob/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/extract-zip": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+			"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"color": "^3.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"debug": "^4.1.1",
+				"get-stream": "^5.1.0",
+				"yauzl": "^2.10.0"
+			},
+			"bin": {
+				"extract-zip": "cli.js"
+			},
+			"engines": {
+				"node": ">= 10.17.0"
+			},
+			"optionalDependencies": {
+				"@types/yauzl": "^2.9.1"
 			}
 		},
-		"postcss-convert-values": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-			"integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+		"node_modules/extract-zip/node_modules/get-stream": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"pump": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"postcss-discard-comments": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-			"integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+		"node_modules/extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
-			},
+			"engines": [
+				"node >=0.6.0"
+			],
+			"license": "MIT"
+		},
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"license": "MIT"
+		},
+		"node_modules/fast-glob": {
+			"version": "2.2.7",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+			"integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"@mrmlnc/readdir-enhanced": "^2.2.1",
+				"@nodelib/fs.stat": "^1.1.2",
+				"glob-parent": "^3.1.0",
+				"is-glob": "^4.0.0",
+				"merge2": "^1.2.3",
+				"micromatch": "^3.1.10"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"postcss-discard-duplicates": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-			"integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"license": "MIT"
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
-			},
+			"license": "MIT"
+		},
+		"node_modules/faye-websocket": {
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+			"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+			"license": "Apache-2.0",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"websocket-driver": ">=0.5.1"
+			},
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"postcss-discard-empty": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-			"integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+		"node_modules/fd-slicer": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+			"integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"pend": "~1.2.0"
 			}
 		},
-		"postcss-discard-overridden": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-			"integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+		"node_modules/figgy-pudding": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+			"integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+			"deprecated": "This module is no longer supported.",
+			"license": "ISC"
+		},
+		"node_modules/figures": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+			"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"escape-string-regexp": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"postcss-load-config": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
-			"integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+		"node_modules/file-entry-cache": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+			"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
 			"dev": true,
-			"requires": {
-				"cosmiconfig": "^5.0.0",
-				"import-cwd": "^2.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"flat-cache": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"postcss-loader": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-			"integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+		"node_modules/file-loader": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
+			"integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
 			"dev": true,
-			"requires": {
-				"loader-utils": "^1.1.0",
-				"postcss": "^7.0.0",
-				"postcss-load-config": "^2.0.0",
-				"schema-utils": "^1.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"schema-utils": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
-					}
-				}
+				"loader-utils": "^1.2.3",
+				"schema-utils": "^2.5.0"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0"
 			}
 		},
-		"postcss-merge-longhand": {
-			"version": "4.0.11",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-			"integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+		"node_modules/file-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
 			"dev": true,
-			"requires": {
-				"css-color-names": "0.0.4",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"stylehacks": "^4.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"postcss-merge-rules": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-			"integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+		"node_modules/file-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-api": "^3.0.0",
-				"cssnano-util-same-parent": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0",
-				"vendors": "^1.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-selector-parser": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-					"dev": true,
-					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
-					}
-				}
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"postcss-minify-font-values": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-			"integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+		"node_modules/file-uri-to-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/filesize": {
+			"version": "3.6.1",
+			"resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
+			"integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+			"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+			"license": "MIT",
+			"dependencies": {
+				"extend-shallow": "^2.0.1",
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1",
+				"to-regex-range": "^2.1.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/fill-range/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"postcss-minify-gradients": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-			"integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+		"node_modules/fill-range/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/finalhandler": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+			"integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"is-color-stop": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"debug": "2.6.9",
+				"encodeurl": "~2.0.0",
+				"escape-html": "~1.0.3",
+				"on-finished": "2.4.1",
+				"parseurl": "~1.3.3",
+				"statuses": "2.0.1",
+				"unpipe": "~1.0.0"
 			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/finalhandler/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"ms": "2.0.0"
 			}
 		},
-		"postcss-minify-params": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-			"integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+		"node_modules/finalhandler/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"dev": true,
-			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"browserslist": "^4.0.0",
-				"cssnano-util-get-arguments": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"uniqs": "^2.0.0"
-			},
+			"license": "MIT"
+		},
+		"node_modules/find-babel-config": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.2.tgz",
+			"integrity": "sha512-oK59njMyw2y3yxto1BCfVK7MQp/OYf4FleHu0RgosH3riFJ1aOuo/7naLDLAObfrgn3ueFhw5sAT/cp0QuJI3Q==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"json5": "^1.0.2",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"postcss-minify-selectors": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-			"integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+		"node_modules/find-babel-config/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
 			"dev": true,
-			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-selector-parser": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-					"dev": true,
-					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
-					}
-				}
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"postcss-modules-extract-imports": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-			"integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-			"requires": {
-				"postcss": "^7.0.5"
-			},
+		"node_modules/find-cache-dir": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"commondir": "^1.0.1",
+				"make-dir": "^3.0.2",
+				"pkg-dir": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
 			}
 		},
-		"postcss-modules-local-by-default": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-			"integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-			"requires": {
-				"icss-utils": "^4.1.1",
-				"postcss": "^7.0.32",
-				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.1.0"
-			},
+		"node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"postcss-modules-scope": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-			"integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-			"requires": {
-				"postcss": "^7.0.6",
-				"postcss-selector-parser": "^6.0.0"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+		"node_modules/find-up/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"postcss-modules-values": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-			"integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-			"requires": {
-				"icss-utils": "^4.0.0",
-				"postcss": "^7.0.6"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+		"node_modules/flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"bin": {
+				"flat": "cli.js"
 			}
 		},
-		"postcss-normalize-charset": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-			"integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+		"node_modules/flat-cache": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+			"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+				"flatted": "^2.0.0",
+				"rimraf": "2.6.3",
+				"write": "1.0.3"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"postcss-normalize-display-values": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-			"integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+		"node_modules/flat-cache/node_modules/rimraf": {
+			"version": "2.6.3",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+			"license": "ISC",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
 			}
 		},
-		"postcss-normalize-positions": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-			"integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+		"node_modules/flatted": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+			"integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+			"license": "ISC"
+		},
+		"node_modules/flush-write-stream": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
-		"postcss-normalize-repeat-style": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-			"integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-			"dev": true,
-			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+		"node_modules/follow-redirects": {
+			"version": "1.15.9",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+			"integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/RubenVerborgh"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=4.0"
 			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
+			"peerDependenciesMeta": {
+				"debug": {
+					"optional": true
 				}
 			}
 		},
-		"postcss-normalize-string": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-			"integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-			"dev": true,
-			"requires": {
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+		"node_modules/fontkit": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.9.0.tgz",
+			"integrity": "sha512-HkW/8Lrk8jl18kzQHvAw9aTHe1cqsyx5sDnxncx652+CIfhawokEPkeM3BoIC+z/Xv7a0yMr0f3pRRwhGH455g==",
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"@swc/helpers": "^0.3.13",
+				"brotli": "^1.3.2",
+				"clone": "^2.1.2",
+				"deep-equal": "^2.0.5",
+				"dfa": "^1.2.0",
+				"restructure": "^2.0.1",
+				"tiny-inflate": "^1.0.3",
+				"unicode-properties": "^1.3.1",
+				"unicode-trie": "^2.0.0"
 			}
 		},
-		"postcss-normalize-timing-functions": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-			"integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-			"dev": true,
-			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+		"node_modules/for-each": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"is-callable": "^1.1.3"
 			}
 		},
-		"postcss-normalize-unicode": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-			"integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+		"node_modules/for-in": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+			"integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/foreground-child": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+			"integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+			"license": "ISC",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"cross-spawn": "^7.0.0",
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"postcss-normalize-url": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-			"integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+		"node_modules/foreground-child/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dev": true,
-			"requires": {
-				"is-absolute-url": "^2.0.0",
-				"normalize-url": "^3.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"postcss-normalize-whitespace": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-			"integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+		"node_modules/foreground-child/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"postcss-ordered-values": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-			"integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+		"node_modules/foreground-child/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"postcss-reduce-initial": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-			"integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+		"node_modules/foreground-child/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-api": "^3.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"postcss-reduce-transforms": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-			"integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+		"node_modules/foreground-child/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"license": "ISC",
+			"engines": {
+				"node": ">=14"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/foreground-child/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"postcss-selector-parser": {
-			"version": "6.0.10",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-			"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-			"requires": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
+		"node_modules/forever-agent": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+			"integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"postcss-svgo": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
-			"integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
+		"node_modules/form-data": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"svgo": "^1.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-					"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-					"dev": true
-				}
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"postcss-unique-selectors": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-			"integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+		"node_modules/forwarded": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
 			"dev": true,
-			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"postcss": "^7.0.0",
-				"uniqs": "^2.0.0"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+		"node_modules/frac": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
+			"integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
+			}
 		},
-		"prebuild-install": {
-			"version": "5.3.4",
-			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.4.tgz",
-			"integrity": "sha512-AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"detect-libc": "^1.0.3",
-				"expand-template": "^2.0.3",
-				"github-from-package": "0.0.0",
-				"minimist": "^1.2.3",
-				"mkdirp": "^0.5.1",
-				"napi-build-utils": "^1.0.1",
-				"node-abi": "^2.7.0",
-				"noop-logger": "^0.1.1",
-				"npmlog": "^4.0.1",
-				"pump": "^3.0.0",
-				"rc": "^1.2.7",
-				"simple-get": "^3.0.3",
-				"tar-fs": "^2.0.0",
-				"tunnel-agent": "^0.6.0",
-				"which-pm-runs": "^1.0.0"
+		"node_modules/fragment-cache": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+			"integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+			"license": "MIT",
+			"dependencies": {
+				"map-cache": "^0.2.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"prelude-ls": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-			"dev": true
+		"node_modules/fresh": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"prepend-http": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-			"integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
-			"dev": true
+		"node_modules/from2": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+			"integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"readable-stream": "^2.0.0"
+			}
 		},
-		"prettier": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
-			"integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
-			"dev": true
+		"node_modules/fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
 		},
-		"pretty": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
-			"integrity": "sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==",
+		"node_modules/fs-extra": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
 			"dev": true,
-			"requires": {
-				"condense-newlines": "^0.2.1",
-				"extend-shallow": "^2.0.1",
-				"js-beautify": "^1.6.12"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+				"graceful-fs": "^4.1.2",
+				"jsonfile": "^4.0.0",
+				"universalify": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=6 <7 || >=8"
 			}
 		},
-		"pretty-error": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
-			"integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
+		"node_modules/fs-minipass": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+			"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
 			"dev": true,
-			"requires": {
-				"lodash": "^4.17.20",
-				"renderkid": "^2.0.4"
+			"license": "ISC",
+			"dependencies": {
+				"minipass": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"printj": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
-			"integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
-		},
-		"process": {
-			"version": "0.11.10",
-			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-			"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-			"dev": true
-		},
-		"process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-			"dev": true
+		"node_modules/fs-write-stream-atomic": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+			"integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==",
+			"deprecated": "This package is no longer supported.",
+			"license": "ISC",
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"iferr": "^0.1.5",
+				"imurmurhash": "^0.1.4",
+				"readable-stream": "1 || 2"
+			}
 		},
-		"progress": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-			"dev": true
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+			"license": "ISC"
 		},
-		"promise-inflight": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-			"integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-			"dev": true
+		"node_modules/fsevents": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+			"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+			"deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"dependencies": {
+				"bindings": "^1.5.0",
+				"nan": "^2.12.1"
+			},
+			"engines": {
+				"node": ">= 4.0"
+			}
 		},
-		"proto-list": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-			"integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
-			"dev": true
+		"node_modules/function-bind": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"proxy-addr": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+		"node_modules/function.prototype.name": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+			"integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
 			"dev": true,
-			"requires": {
-				"forwarded": "0.2.0",
-				"ipaddr.js": "1.9.1"
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
+				"es-abstract": "^1.22.1",
+				"functions-have-names": "^1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"prr": {
+		"node_modules/functional-red-black-tree": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-			"integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
-			"dev": true
-		},
-		"pseudomap": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-			"integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"psl": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-			"integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-			"dev": true
+		"node_modules/functions-have-names": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"public-encrypt": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+		"node_modules/gauge": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+			"integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
+			"deprecated": "This package is no longer supported.",
 			"dev": true,
-			"requires": {
-				"bn.js": "^4.1.0",
-				"browserify-rsa": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"parse-asn1": "^5.0.0",
-				"randombytes": "^2.0.1",
-				"safe-buffer": "^5.1.2"
-			},
+			"license": "ISC",
+			"optional": true,
 			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
+				"aproba": "^1.0.3",
+				"console-control-strings": "^1.0.0",
+				"has-unicode": "^2.0.0",
+				"object-assign": "^4.1.0",
+				"signal-exit": "^3.0.0",
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1",
+				"wide-align": "^1.1.0"
 			}
 		},
-		"pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+		"node_modules/gauge/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
 			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"pumpify": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-			"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+		"node_modules/gauge/node_modules/is-fullwidth-code-point": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+			"integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
 			"dev": true,
-			"requires": {
-				"duplexify": "^3.6.0",
-				"inherits": "^2.0.3",
-				"pump": "^2.0.0"
-			},
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
-				"pump": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-					"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				}
+				"number-is-nan": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-		},
-		"q": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-			"integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
-			"dev": true
-		},
-		"qs": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-			"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-			"dev": true
-		},
-		"query-string": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-			"integrity": "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==",
+		"node_modules/gauge/node_modules/string-width": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
 			"dev": true,
-			"requires": {
-				"object-assign": "^4.1.0",
-				"strict-uri-encode": "^1.0.0"
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"code-point-at": "^1.0.0",
+				"is-fullwidth-code-point": "^1.0.0",
+				"strip-ansi": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"querystring": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-			"integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
-			"dev": true
+		"node_modules/gauge/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"querystring-es3": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-			"integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-			"dev": true
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"querystringify": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
 		},
-		"raf": {
-			"version": "3.4.1",
-			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-			"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-			"requires": {
-				"performance-now": "^2.1.0"
+		"node_modules/get-func-name": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+			"integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"ramda": {
-			"version": "0.24.1",
-			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz",
-			"integrity": "sha512-HEm619G8PaZMfkqCa23qiOe7r3R0brPu7ZgOsgKUsnvLhd0qhc/vTjkUovomgPWa5ECBa08fJZixth9LaoBo5w==",
-			"dev": true
+		"node_modules/get-intrinsic": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"randombytes": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+		"node_modules/get-stream": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 			"dev": true,
-			"requires": {
-				"safe-buffer": "^5.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"pump": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"randomfill": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+		"node_modules/get-symbol-description": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+			"integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
 			"dev": true,
-			"requires": {
-				"randombytes": "^2.0.5",
-				"safe-buffer": "^5.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.5",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"range-parser": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-			"dev": true
+		"node_modules/get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"raw-body": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+		"node_modules/getos": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
+			"integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
 			"dev": true,
-			"requires": {
-				"bytes": "3.1.2",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"unpipe": "1.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
+				"async": "^3.2.0"
 			}
 		},
-		"rc": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+		"node_modules/getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"deep-extend": "^0.6.0",
-				"ini": "~1.3.0",
-				"minimist": "^1.2.0",
-				"strip-json-comments": "~2.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "^1.0.0"
 			}
 		},
-		"read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+		"node_modules/github-from-package": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+			"integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
 			"dev": true,
-			"requires": {
-				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
+			"license": "ISC",
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
 			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/glob-parent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+			"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+			"devOptional": true,
+			"license": "ISC",
 			"dependencies": {
-				"parse-json": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-					"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.0.0",
-						"error-ex": "^1.3.1",
-						"json-parse-even-better-errors": "^2.3.0",
-						"lines-and-columns": "^1.1.6"
-					}
-				}
+				"is-glob": "^3.1.0",
+				"path-dirname": "^1.0.0"
 			}
 		},
-		"readable-stream": {
-			"version": "2.3.7",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-			"dev": true,
-			"requires": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
+		"node_modules/glob-parent/node_modules/is-glob": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+			"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+			"devOptional": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-extglob": "^2.1.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/glob-to-regexp": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+			"integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==",
+			"dev": true,
+			"license": "BSD"
+		},
+		"node_modules/global-dirs": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+			"integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-					"dev": true
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-					"dev": true
-				}
+				"ini": "2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"readdirp": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+		"node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"picomatch": "^2.2.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"rechoir": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-			"integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+		"node_modules/globalthis": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+			"integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
 			"dev": true,
-			"requires": {
-				"resolve": "^1.1.6"
+			"license": "MIT",
+			"dependencies": {
+				"define-properties": "^1.2.1",
+				"gopd": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"regenerate": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-			"dev": true
+		"node_modules/globby": {
+			"version": "9.2.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
+			"integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/glob": "^7.1.1",
+				"array-union": "^1.0.2",
+				"dir-glob": "^2.2.2",
+				"fast-glob": "^2.2.6",
+				"glob": "^7.1.3",
+				"ignore": "^4.0.3",
+				"pify": "^4.0.1",
+				"slash": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"regenerate-unicode-properties": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-			"integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+		"node_modules/globby/node_modules/pify": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
 			"dev": true,
-			"requires": {
-				"regenerate": "^1.4.2"
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+			"license": "MIT",
+			"dependencies": {
+				"get-intrinsic": "^1.1.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"regenerator-runtime": {
-			"version": "0.13.10",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-			"integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+		"node_modules/graceful-fs": {
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+			"license": "ISC"
 		},
-		"regenerator-transform": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-			"integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+		"node_modules/growl": {
+			"version": "1.10.5",
+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
 			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.8.4"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4.x"
 			}
 		},
-		"regex-not": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+		"node_modules/gzip-size": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+			"integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
 			"dev": true,
-			"requires": {
-				"extend-shallow": "^3.0.2",
-				"safe-regex": "^1.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"duplexer": "^0.1.1",
+				"pify": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"regexp.prototype.flags": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-			"integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"functions-have-names": "^1.2.2"
+		"node_modules/gzip-size/node_modules/pify": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"regexpp": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-			"integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+		"node_modules/handle-thing": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
 			"dev": true,
-			"optional": true
+			"license": "MIT"
 		},
-		"regexpu-core": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-			"integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+		"node_modules/har-schema": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+			"integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
 			"dev": true,
-			"requires": {
-				"regenerate": "^1.4.2",
-				"regenerate-unicode-properties": "^10.1.0",
-				"regjsgen": "^0.7.1",
-				"regjsparser": "^0.9.1",
-				"unicode-match-property-ecmascript": "^2.0.0",
-				"unicode-match-property-value-ecmascript": "^2.0.0"
+			"license": "ISC",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"regjsgen": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-			"integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==",
-			"dev": true
-		},
-		"regjsparser": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+		"node_modules/har-validator": {
+			"version": "5.1.5",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+			"deprecated": "this library is no longer supported",
 			"dev": true,
-			"requires": {
-				"jsesc": "~0.5.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"jsesc": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-					"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-					"dev": true
-				}
+				"ajv": "^6.12.3",
+				"har-schema": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"regression": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/regression/-/regression-2.0.1.tgz",
-			"integrity": "sha512-A4XYsc37dsBaNOgEjkJKzfJlE394IMmUPlI/p3TTI9u3T+2a+eox5Pr/CPUqF0eszeWZJPAc6QkroAhuUpWDJQ=="
+		"node_modules/has": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+			"integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4.0"
+			}
 		},
-		"relateurl": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-			"integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-			"dev": true
+		"node_modules/has-ansi": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"remove-trailing-separator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-			"dev": true
+		"node_modules/has-ansi/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"renderkid": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz",
-			"integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==",
-			"dev": true,
-			"requires": {
-				"css-select": "^4.1.3",
-				"dom-converter": "^0.2.0",
-				"htmlparser2": "^6.1.0",
-				"lodash": "^4.17.21",
-				"strip-ansi": "^3.0.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"css-select": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-					"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0",
-						"css-what": "^6.0.1",
-						"domhandler": "^4.3.1",
-						"domutils": "^2.8.0",
-						"nth-check": "^2.0.1"
-					}
-				},
-				"css-what": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-					"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-					"dev": true
-				},
-				"dom-serializer": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-					"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.2.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domutils": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.2.0",
-						"domhandler": "^4.2.0"
-					}
-				},
-				"nth-check": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-					"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				}
+		"node_modules/has-bigints": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+			"integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"repeat-element": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-			"integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-			"dev": true
-		},
-		"repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-			"dev": true
-		},
-		"repeating": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-			"integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
+		"node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
 			"dev": true,
-			"requires": {
-				"is-finite": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"request": {
-			"version": "2.88.2",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-			"dev": true,
-			"requires": {
-				"aws-sign2": "~0.7.0",
-				"aws4": "^1.8.0",
-				"caseless": "~0.12.0",
-				"combined-stream": "~1.0.6",
-				"extend": "~3.0.2",
-				"forever-agent": "~0.6.1",
-				"form-data": "~2.3.2",
-				"har-validator": "~5.1.3",
-				"http-signature": "~1.2.0",
-				"is-typedarray": "~1.0.0",
-				"isstream": "~0.1.2",
-				"json-stringify-safe": "~5.0.1",
-				"mime-types": "~2.1.19",
-				"oauth-sign": "~0.9.0",
-				"performance-now": "^2.1.0",
-				"qs": "~6.5.2",
-				"safe-buffer": "^5.1.2",
-				"tough-cookie": "~2.5.0",
-				"tunnel-agent": "^0.6.0",
-				"uuid": "^3.3.2"
+		"node_modules/has-property-descriptors": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+			"license": "MIT",
+			"dependencies": {
+				"es-define-property": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"request-progress": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
-			"integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
-			"dev": true,
-			"requires": {
-				"throttleit": "^1.0.0"
+		"node_modules/has-proto": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+			"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"request-promise-core": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-			"integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.19"
+		"node_modules/has-symbols": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"request-promise-native": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-			"integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-			"dev": true,
-			"requires": {
-				"request-promise-core": "1.1.4",
-				"stealthy-require": "^1.1.1",
-				"tough-cookie": "^2.3.3"
+		"node_modules/has-tostringtag": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+			"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+			"license": "MIT",
+			"dependencies": {
+				"has-symbols": "^1.0.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-			"dev": true
-		},
-		"require-main-filename": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-			"integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
-			"dev": true
-		},
-		"require-uncached": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-			"integrity": "sha512-Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w==",
+		"node_modules/has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"caller-path": "^0.1.0",
-				"resolve-from": "^1.0.0"
+			"license": "ISC",
+			"optional": true
+		},
+		"node_modules/has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+			"license": "MIT",
+			"dependencies": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"requires-port": {
+		"node_modules/has-values": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+			"license": "MIT",
+			"dependencies": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"reselect": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
-			"integrity": "sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==",
-			"dev": true
+		"node_modules/has-values/node_modules/kind-of": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+			"integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+			"license": "MIT",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"resolve": {
-			"version": "1.22.1",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-			"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-			"requires": {
-				"is-core-module": "^2.9.0",
-				"path-parse": "^1.0.7",
-				"supports-preserve-symlinks-flag": "^1.0.0"
+		"node_modules/hash-base": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+			"integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"resolve-cwd": {
+		"node_modules/hash-sum": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-			"integrity": "sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+			"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
 			"dev": true,
-			"requires": {
-				"resolve-from": "^3.0.0"
-			},
+			"license": "MIT"
+		},
+		"node_modules/hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"license": "MIT",
 			"dependencies": {
-				"resolve-from": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-					"integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-					"dev": true
-				}
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
 			}
 		},
-		"resolve-from": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-			"integrity": "sha512-kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg==",
-			"dev": true,
-			"optional": true
-		},
-		"resolve-url": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
-			"dev": true
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+			"license": "MIT",
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"restore-cursor": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-			"integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
+		"node_modules/he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true,
-			"requires": {
-				"onetime": "^2.0.0",
-				"signal-exit": "^3.0.2"
+			"license": "MIT",
+			"bin": {
+				"he": "bin/he"
 			}
 		},
-		"restructure": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/restructure/-/restructure-2.0.1.tgz",
-			"integrity": "sha512-e0dOpjm5DseomnXx2M5lpdZ5zoHqF1+bqdMJUohoYVVQa7cBdnk7fdmeI6byNWP/kiME72EeTiSypTCVnpLiDg=="
-		},
-		"ret": {
-			"version": "0.1.15",
-			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-			"dev": true
-		},
-		"retry": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-			"integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
-			"dev": true
-		},
-		"rgb-regex": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-			"integrity": "sha512-gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w==",
-			"dev": true
-		},
-		"rgba-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-			"integrity": "sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==",
-			"dev": true
-		},
-		"rgbcolor": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
-			"integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="
-		},
-		"rimraf": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+		"node_modules/hex-color-regex": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+			"integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
 			"dev": true,
-			"requires": {
-				"glob": "^7.1.3"
-			}
+			"license": "MIT"
 		},
-		"ripemd160": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+		"node_modules/highlight.js": {
+			"version": "10.7.3",
+			"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
+			"integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
 			"dev": true,
-			"requires": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1"
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"roboto-fontface": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz",
-			"integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="
-		},
-		"run-async": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-			"integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-			"dev": true
+		"node_modules/hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+			"license": "MIT",
+			"dependencies": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
 		},
-		"run-queue": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-			"integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==",
+		"node_modules/hoopy": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
 			"dev": true,
-			"requires": {
-				"aproba": "^1.1.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 6.0.0"
 			}
 		},
-		"rx-lite": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-			"integrity": "sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==",
+		"node_modules/hosted-git-info": {
+			"version": "2.8.9",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
 			"dev": true,
-			"optional": true
+			"license": "ISC"
 		},
-		"rx-lite-aggregates": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-			"integrity": "sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==",
+		"node_modules/hpack.js": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"rx-lite": "*"
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"obuf": "^1.0.0",
+				"readable-stream": "^2.0.1",
+				"wbuf": "^1.1.0"
 			}
 		},
-		"rxjs": {
-			"version": "5.5.12",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
-			"integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+		"node_modules/hsl-regex": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+			"integrity": "sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A==",
 			"dev": true,
-			"requires": {
-				"symbol-observable": "1.0.1"
-			}
+			"license": "MIT"
 		},
-		"safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+		"node_modules/hsla-regex": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+			"integrity": "sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"safe-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-			"integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+		"node_modules/html-encoding-sniffer": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+			"integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
 			"dev": true,
-			"requires": {
-				"ret": "~0.1.10"
+			"license": "MIT",
+			"dependencies": {
+				"whatwg-encoding": "^1.0.1"
 			}
 		},
-		"safe-regex-test": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-			"integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.3",
-				"is-regex": "^1.1.4"
+		"node_modules/html-entities": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+			"integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/html-minifier": {
+			"version": "3.5.21",
+			"resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+			"integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"camel-case": "3.0.x",
+				"clean-css": "4.2.x",
+				"commander": "2.17.x",
+				"he": "1.2.x",
+				"param-case": "2.1.x",
+				"relateurl": "0.2.x",
+				"uglify-js": "3.4.x"
+			},
+			"bin": {
+				"html-minifier": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+		"node_modules/html-minifier/node_modules/commander": {
+			"version": "2.17.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+			"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"sass": {
-			"version": "1.19.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.19.0.tgz",
-			"integrity": "sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==",
+		"node_modules/html-tags": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+			"integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
 			"dev": true,
-			"requires": {
-				"chokidar": "^2.0.0"
-			},
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/html-webpack-plugin": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+			"integrity": "sha512-Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg==",
+			"deprecated": "3.x is no longer supported",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"anymatch": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^3.1.4",
-						"normalize-path": "^2.1.1"
-					},
-					"dependencies": {
-						"normalize-path": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-							"integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-							"dev": true,
-							"requires": {
-								"remove-trailing-separator": "^1.0.1"
-							}
-						}
-					}
-				},
-				"binary-extensions": {
-					"version": "1.13.1",
-					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-					"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-					"dev": true
-				},
-				"chokidar": {
-					"version": "2.1.8",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.1",
-						"braces": "^2.3.2",
-						"fsevents": "^1.2.7",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.3",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"normalize-path": "^3.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.2.1",
-						"upath": "^1.1.1"
-					}
-				},
-				"fsevents": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"bindings": "^1.5.0",
-						"nan": "^2.12.1"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-							"dev": true,
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				},
-				"is-binary-path": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-					"integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-					"dev": true,
-					"requires": {
-						"binary-extensions": "^1.0.0"
-					}
-				},
-				"readdirp": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-					"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.11",
-						"micromatch": "^3.1.10",
-						"readable-stream": "^2.0.2"
-					}
-				}
+				"html-minifier": "^3.2.3",
+				"loader-utils": "^0.2.16",
+				"lodash": "^4.17.3",
+				"pretty-error": "^2.0.2",
+				"tapable": "^1.0.0",
+				"toposort": "^1.0.0",
+				"util.promisify": "1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9"
+			},
+			"peerDependencies": {
+				"webpack": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0"
 			}
 		},
-		"sass-loader": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz",
-			"integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==",
+		"node_modules/html-webpack-plugin/node_modules/big.js": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+			"integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
 			"dev": true,
-			"requires": {
-				"clone-deep": "^4.0.1",
-				"loader-utils": "^1.2.3",
-				"neo-async": "^2.6.1",
-				"schema-utils": "^2.1.0",
-				"semver": "^6.3.0"
+			"license": "MIT",
+			"engines": {
+				"node": "*"
 			}
 		},
-		"sax": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+		"node_modules/html-webpack-plugin/node_modules/emojis-list": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+			"integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10"
+			}
 		},
-		"saxes": {
-			"version": "3.1.11",
-			"resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
-			"integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+		"node_modules/html-webpack-plugin/node_modules/json5": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+			"integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
 			"dev": true,
-			"requires": {
-				"xmlchars": "^2.1.1"
+			"license": "MIT",
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"schema-utils": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-			"requires": {
-				"@types/json-schema": "^7.0.5",
-				"ajv": "^6.12.4",
-				"ajv-keywords": "^3.5.2"
-			},
+		"node_modules/html-webpack-plugin/node_modules/loader-utils": {
+			"version": "0.2.17",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+			"integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
+				"big.js": "^3.1.3",
+				"emojis-list": "^2.0.0",
+				"json5": "^0.5.0",
+				"object-assign": "^4.0.1"
+			}
+		},
+		"node_modules/htmlparser2": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+			"dev": true,
+			"funding": [
+				"https://github.com/fb55/htmlparser2?sponsor=1",
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
 				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0",
+				"domutils": "^2.5.2",
+				"entities": "^2.0.0"
 			}
 		},
-		"select-hose": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-			"dev": true
+		"node_modules/http-deceiver": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"selfsigned": {
-			"version": "1.10.14",
-			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz",
-			"integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==",
+		"node_modules/http-errors": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
 			"dev": true,
-			"requires": {
-				"node-forge": "^0.10.0"
+			"license": "MIT",
+			"dependencies": {
+				"depd": "2.0.0",
+				"inherits": "2.0.4",
+				"setprototypeof": "1.2.0",
+				"statuses": "2.0.1",
+				"toidentifier": "1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true
+		"node_modules/http-parser-js": {
+			"version": "0.5.8",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+			"integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+			"license": "MIT"
 		},
-		"send": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+		"node_modules/http-proxy": {
+			"version": "1.18.1",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
 			"dev": true,
-			"requires": {
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"mime": "1.6.0",
-				"ms": "2.1.3",
-				"on-finished": "2.4.1",
-				"range-parser": "~1.2.1",
-				"statuses": "2.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"eventemitter3": "^4.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
 			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/http-proxy-middleware": {
+			"version": "0.20.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.20.0.tgz",
+			"integrity": "sha512-dNJAk71nEJhPiAczQH9hGvE/MT9kEs+zn2Dh+Hi94PGZe1GluQirC7mw5rdREUtWx6qGS1Gu0bZd4qEAg+REgw==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					},
-					"dependencies": {
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-							"dev": true
-						}
-					}
-				},
-				"mime": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-					"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-					"dev": true
-				}
+				"http-proxy": "^1.17.0",
+				"is-glob": "^4.0.1",
+				"lodash": "^4.17.14",
+				"micromatch": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=8.0.0"
 			}
 		},
-		"serialize-javascript": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-			"integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+		"node_modules/http-proxy-middleware-secure-cookies": {
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware-secure-cookies/-/http-proxy-middleware-secure-cookies-0.1.8.tgz",
+			"integrity": "sha512-x4DH8N910xocxW5hjCXI/5XT2huTgTduLEN6vIt/Fve88YsDEs6XOpD/PJAYxYqdlLsnktfEFj5jXIat92B/WA==",
 			"dev": true,
-			"requires": {
-				"randombytes": "^2.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"@types/cookie": "^0.4.0",
+				"@types/http-proxy-middleware": "^0.19.3",
+				"@types/inquirer": "^7.3.1",
+				"cookie": "^0.4.1",
+				"inquirer": "^7.3.3"
+			},
+			"optionalDependencies": {
+				"keytar": "^6.0.1"
+			},
+			"peerDependencies": {
+				"http-proxy-middleware": ">=0.19 <2"
 			}
 		},
-		"serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
 			"dev": true,
-			"requires": {
-				"accepts": "~1.3.4",
-				"batch": "0.6.1",
-				"debug": "2.6.9",
-				"escape-html": "~1.0.3",
-				"http-errors": "~1.6.2",
-				"mime-types": "~2.1.17",
-				"parseurl": "~1.3.2"
+			"license": "MIT",
+			"dependencies": {
+				"type-fest": "^0.21.3"
 			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-					"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-					"dev": true
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-					"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-					"dev": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-					"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-					"dev": true
-				},
-				"statuses": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-					"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-					"dev": true
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"parseurl": "~1.3.3",
-				"send": "0.18.0"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"set-blocking": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-			"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-			"dev": true
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/cli-width": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+			"integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">= 10"
+			}
 		},
-		"set-value": {
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/color-convert": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-extendable": "^0.1.1",
-				"is-plain-object": "^2.0.3",
-				"split-string": "^3.0.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"setimmediate": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-			"dev": true
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"setprototypeof": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-			"dev": true
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"sha.js": {
-			"version": "2.4.11",
-			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/inquirer": {
+			"version": "7.3.3",
+			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+			"integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
 			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.1.0",
+				"cli-cursor": "^3.1.0",
+				"cli-width": "^3.0.0",
+				"external-editor": "^3.0.3",
+				"figures": "^3.0.0",
+				"lodash": "^4.17.19",
+				"mute-stream": "0.0.8",
+				"run-async": "^2.4.0",
+				"rxjs": "^6.6.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0",
+				"through": "^2.3.6"
+			},
+			"engines": {
+				"node": ">=8.0.0"
 			}
 		},
-		"shallow-clone": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/mute-stream": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^6.0.2"
-			}
+			"license": "ISC"
 		},
-		"shebang-command": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-			"integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"shebang-regex": "^1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"shebang-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-			"integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-			"dev": true
+		"node_modules/http-proxy-middleware-secure-cookies/node_modules/type-fest": {
+			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"shell-quote": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz",
-			"integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==",
-			"dev": true
+		"node_modules/http-proxy-middleware/node_modules/braces": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fill-range": "^7.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"shelljs": {
-			"version": "0.8.5",
-			"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
-			"integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+		"node_modules/http-proxy-middleware/node_modules/fill-range": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dev": true,
-			"requires": {
-				"glob": "^7.0.0",
-				"interpret": "^1.0.0",
-				"rechoir": "^0.6.2"
+			"license": "MIT",
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"side-channel": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"requires": {
-				"call-bind": "^1.0.0",
-				"get-intrinsic": "^1.0.2",
-				"object-inspect": "^1.9.0"
+		"node_modules/http-proxy-middleware/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.12.0"
 			}
 		},
-		"sigmund": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-			"integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
-			"dev": true
+		"node_modules/http-proxy-middleware/node_modules/micromatch": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"braces": "^3.0.3",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
 		},
-		"signal-exit": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-			"dev": true
+		"node_modules/http-proxy-middleware/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
 		},
-		"simple-concat": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-			"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+		"node_modules/http-signature": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
+			"integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==",
 			"dev": true,
-			"optional": true
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^2.0.2",
+				"sshpk": "^1.18.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
 		},
-		"simple-get": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
-			"integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+		"node_modules/https-browserify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+			"integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
+			"license": "MIT"
+		},
+		"node_modules/human-signals": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"decompress-response": "^4.2.0",
-				"once": "^1.3.1",
-				"simple-concat": "^1.0.0"
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=8.12.0"
 			}
 		},
-		"simple-swizzle": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-			"integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+		"node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 			"dev": true,
-			"requires": {
-				"is-arrayish": "^0.3.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"is-arrayish": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-					"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-					"dev": true
-				}
+				"safer-buffer": ">= 2.1.2 < 3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"sinon": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.1.tgz",
-			"integrity": "sha512-ZSSmlkSyhUWbkF01Z9tEbxZLF/5tRC9eojCdFh33gtQaP7ITQVaMWQHGuFM7Cuf/KEfihuh1tTl3/ABju3AQMg==",
-			"requires": {
-				"@sinonjs/commons": "^1.8.3",
-				"@sinonjs/fake-timers": "^7.1.0",
-				"@sinonjs/samsam": "^6.0.2",
-				"diff": "^5.0.0",
-				"nise": "^5.1.0",
-				"supports-color": "^7.2.0"
+		"node_modules/icss-utils": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+			"integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+			"license": "ISC",
+			"dependencies": {
+				"postcss": "^7.0.14"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"slash": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-			"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-			"dev": true
+		"node_modules/ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"license": "BSD-3-Clause"
 		},
-		"slice-ansi": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-			"integrity": "sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==",
-			"dev": true
+		"node_modules/iferr": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+			"integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==",
+			"license": "MIT"
 		},
-		"snapdragon": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+		"node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
 			"dev": true,
-			"requires": {
-				"base": "^0.11.1",
-				"debug": "^2.2.0",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"map-cache": "^0.2.2",
-				"source-map": "^0.5.6",
-				"source-map-resolve": "^0.5.0",
-				"use": "^3.1.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/imask": {
+			"version": "6.6.3",
+			"resolved": "https://registry.npmjs.org/imask/-/imask-6.6.3.tgz",
+			"integrity": "sha512-a9MTDhm+ET4G2IRcdUGuVTXHS05WsRNPGM5CeNJnXiXuoi4zv7g0/UDFLlRF4lBBeb8EWds4C4JVwhI0nuAIug==",
+			"license": "MIT",
+			"engines": {
+				"npm": ">=4.0.0"
+			}
+		},
+		"node_modules/import-cwd": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+			"integrity": "sha512-Ew5AZzJQFqrOV5BTW3EIoHAnoie1LojZLXKcCQ/yTRyVZosBhK1x1ViYjHGf5pAFOq8ZyChZp6m/fSN7pJyZtg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"import-from": "^2.1.0"
 			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/import-fresh": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+			"integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-					"dev": true
-				}
+				"caller-path": "^2.0.0",
+				"resolve-from": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"snapdragon-node": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+		"node_modules/import-from": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+			"integrity": "sha512-0vdnLL2wSGnhlRmzHJAg5JHjt1l2vYhzJ7tNLGbeVg0fse56tpGaH0uzH+r9Slej+BSXXEHvBKDEnVSLLE9/+w==",
 			"dev": true,
-			"requires": {
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.0",
-				"snapdragon-util": "^3.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"resolve-from": "^3.0.0"
 			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/import-local": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+			"integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
+				"pkg-dir": "^3.0.0",
+				"resolve-cwd": "^2.0.0"
+			},
+			"bin": {
+				"import-local-fixture": "fixtures/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"snapdragon-util": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+		"node_modules/import-local/node_modules/find-up": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^3.2.0"
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^3.0.0"
 			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/import-local/node_modules/locate-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"p-locate": "^3.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"sockjs": {
-			"version": "0.3.24",
-			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+		"node_modules/import-local/node_modules/p-locate": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
 			"dev": true,
-			"requires": {
-				"faye-websocket": "^0.11.3",
-				"uuid": "^8.3.2",
-				"websocket-driver": "^0.7.4"
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.0.0"
 			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/import-local/node_modules/pkg-dir": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+			"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-					"dev": true
-				}
+				"find-up": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"sockjs-client": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz",
-			"integrity": "sha512-qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ==",
-			"requires": {
-				"debug": "^3.2.7",
-				"eventsource": "^1.1.0",
-				"faye-websocket": "^0.11.4",
-				"inherits": "^2.0.4",
-				"url-parse": "^1.5.10"
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.19"
 			}
 		},
-		"sort-keys": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-			"integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+		"node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
 			"dev": true,
-			"requires": {
-				"is-plain-obj": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"sortablejs": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
-			"integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+		"node_modules/indexes-of": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+			"integrity": "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"source-list-map": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-			"integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-			"dev": true
+		"node_modules/infer-owner": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+			"integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+			"license": "ISC"
 		},
-		"source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+			"license": "ISC",
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
 		},
-		"source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"license": "ISC"
 		},
-		"source-map-resolve": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+		"node_modules/ini": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+			"integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
 			"dev": true,
-			"requires": {
-				"atob": "^2.1.2",
-				"decode-uri-component": "^0.2.0",
-				"resolve-url": "^0.2.1",
-				"source-map-url": "^0.4.0",
-				"urix": "^0.1.0"
+			"license": "ISC",
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+		"node_modules/inquirer": {
+			"version": "6.5.2",
+			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+			"integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
 			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-escapes": "^3.2.0",
+				"chalk": "^2.4.2",
+				"cli-cursor": "^2.1.0",
+				"cli-width": "^2.0.0",
+				"external-editor": "^3.0.3",
+				"figures": "^2.0.0",
+				"lodash": "^4.17.12",
+				"mute-stream": "0.0.7",
+				"run-async": "^2.2.0",
+				"rxjs": "^6.4.0",
+				"string-width": "^2.1.0",
+				"strip-ansi": "^5.1.0",
+				"through": "^2.3.6"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"source-map-url": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-			"integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-			"dev": true
+		"node_modules/inquirer/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+		"node_modules/inquirer/node_modules/cli-cursor": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+			"integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
 			"dev": true,
-			"requires": {
-				"spdx-expression-parse": "^3.0.0",
-				"spdx-license-ids": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"restore-cursor": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"spdx-exceptions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-			"dev": true
+		"node_modules/inquirer/node_modules/figures": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+			"integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"spdx-expression-parse": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+		"node_modules/inquirer/node_modules/is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
 			"dev": true,
-			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"spdx-license-ids": {
-			"version": "3.0.12",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-			"integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
-			"dev": true
+		"node_modules/inquirer/node_modules/mimic-fn": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+			"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"spdy": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+		"node_modules/inquirer/node_modules/onetime": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+			"integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
 			"dev": true,
-			"requires": {
-				"debug": "^4.1.0",
-				"handle-thing": "^2.0.0",
-				"http-deceiver": "^1.2.7",
-				"select-hose": "^2.0.0",
-				"spdy-transport": "^3.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
+				"mimic-fn": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"spdy-transport": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+		"node_modules/inquirer/node_modules/restore-cursor": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+			"integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
 			"dev": true,
-			"requires": {
-				"debug": "^4.1.0",
-				"detect-node": "^2.0.4",
-				"hpack.js": "^2.1.6",
-				"obuf": "^1.1.2",
-				"readable-stream": "^3.0.6",
-				"wbuf": "^1.7.3"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"onetime": "^2.0.0",
+				"signal-exit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"split-string": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+		"node_modules/inquirer/node_modules/string-width": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
 			"dev": true,
-			"requires": {
-				"extend-shallow": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-			"dev": true
-		},
-		"ssf": {
-			"version": "0.10.3",
-			"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz",
-			"integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==",
-			"requires": {
-				"frac": "~1.1.2"
+		"node_modules/inquirer/node_modules/string-width/node_modules/ansi-regex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+			"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"sshpk": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-			"integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+		"node_modules/inquirer/node_modules/string-width/node_modules/strip-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
 			"dev": true,
-			"requires": {
-				"asn1": "~0.2.3",
-				"assert-plus": "^1.0.0",
-				"bcrypt-pbkdf": "^1.0.0",
-				"dashdash": "^1.12.0",
-				"ecc-jsbn": "~0.1.1",
-				"getpass": "^0.1.1",
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.0.2",
-				"tweetnacl": "~0.14.0"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"ssri": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-			"integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+		"node_modules/inquirer/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 			"dev": true,
-			"requires": {
-				"figgy-pudding": "^3.5.1"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"stable": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-			"dev": true
-		},
-		"stackblur-canvas": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz",
-			"integrity": "sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ=="
-		},
-		"stackframe": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
-			"integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
-			"dev": true
+		"node_modules/install": {
+			"version": "0.13.0",
+			"resolved": "https://registry.npmjs.org/install/-/install-0.13.0.tgz",
+			"integrity": "sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10"
+			}
 		},
-		"static-extend": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-			"integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+		"node_modules/internal-ip": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+			"integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
 			"dev": true,
-			"requires": {
-				"define-property": "^0.2.5",
-				"object-copy": "^0.1.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
+				"default-gateway": "^4.2.0",
+				"ipaddr.js": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"statuses": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-			"dev": true
+		"node_modules/internal-ip/node_modules/default-gateway": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+			"integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"execa": "^1.0.0",
+				"ip-regex": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"stealthy-require": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-			"integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==",
-			"dev": true
+		"node_modules/internal-slot": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+			"integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"hasown": "^2.0.0",
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"stream-browserify": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-			"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+		"node_modules/interpret": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+			"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
 			"dev": true,
-			"requires": {
-				"inherits": "~2.0.1",
-				"readable-stream": "^2.0.2"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"stream-each": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-			"integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+		"node_modules/invariant": {
+			"version": "2.2.4",
+			"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+			"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
 			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.1.0",
-				"stream-shift": "^1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"loose-envify": "^1.0.0"
 			}
 		},
-		"stream-http": {
-			"version": "2.8.3",
-			"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-			"integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+		"node_modules/invert-kv": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+			"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
 			"dev": true,
-			"requires": {
-				"builtin-status-codes": "^3.0.0",
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.3.6",
-				"to-arraybuffer": "^1.0.0",
-				"xtend": "^4.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"stream-shift": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-			"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-			"dev": true
-		},
-		"stream-to-observable": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.1.0.tgz",
-			"integrity": "sha512-h3mR71JoHxXrKApehgQk1CFbdi2nW9BAVqjPhpPD127H8iz0N61YsCLhJutm+JV0ajNAwPef0kMQsF0Jaz/A6Q==",
-			"dev": true
-		},
-		"strict-uri-encode": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-			"integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
-			"dev": true
+		"node_modules/ip": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+			"integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"string-width": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-			"integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+		"node_modules/ip-regex": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+			"integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
 			"dev": true,
-			"requires": {
-				"code-point-at": "^1.0.0",
-				"is-fullwidth-code-point": "^1.0.0",
-				"strip-ansi": "^3.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"string.prototype.padstart": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.3.tgz",
-			"integrity": "sha512-NZydyOMtYxpTjGqp0VN5PYUF/tsU15yDMZnUdj16qRUIUiMJkHHSDElYyQFrMu+/WloTpA7MQSiADhBicDfaoA==",
+		"node_modules/ipaddr.js": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"string.prototype.trimend": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-			"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
+		"node_modules/is-absolute-url": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+			"integrity": "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"string.prototype.trimstart": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-			"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
+		"node_modules/is-accessor-descriptor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+			"integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+			"license": "MIT",
+			"dependencies": {
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"string_decoder": {
+		"node_modules/is-arguments": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "~5.1.0"
+			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-array-buffer": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+			"integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+			"license": "MIT",
 			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-					"dev": true
-				}
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"strip-ansi": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
 			"dev": true,
-			"requires": {
-				"ansi-regex": "^4.1.0"
+			"license": "MIT"
+		},
+		"node_modules/is-bigint": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+			"license": "MIT",
+			"dependencies": {
+				"has-bigints": "^1.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"strip-eof": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-			"integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
-			"dev": true
+		"node_modules/is-binary-path": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+			"integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
+			"devOptional": true,
+			"license": "MIT",
+			"dependencies": {
+				"binary-extensions": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true
+		"node_modules/is-boolean-object": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"strip-indent": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-			"integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-			"dev": true
+		"node_modules/is-buffer": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+			"license": "MIT"
 		},
-		"strip-json-comments": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-			"integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-			"dev": true
+		"node_modules/is-callable": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"stylehacks": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-			"integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+		"node_modules/is-ci": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+			"integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"ci-info": "^3.2.0"
 			},
+			"bin": {
+				"is-ci": "bin.js"
+			}
+		},
+		"node_modules/is-color-stop": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+			"integrity": "sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"postcss-selector-parser": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-					"dev": true,
-					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
-					}
-				}
+				"css-color-names": "^0.0.4",
+				"hex-color-regex": "^1.1.0",
+				"hsl-regex": "^1.0.0",
+				"hsla-regex": "^1.0.0",
+				"rgb-regex": "^1.0.1",
+				"rgba-regex": "^1.0.0"
 			}
 		},
-		"supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"requires": {
-				"has-flag": "^4.0.0"
+		"node_modules/is-core-module": {
+			"version": "2.15.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+			"integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+			"license": "MIT",
+			"dependencies": {
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"supports-preserve-symlinks-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+		"node_modules/is-data-descriptor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+			"integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+			"license": "MIT",
+			"dependencies": {
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"svg-pathdata": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
-			"integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="
+		"node_modules/is-data-view": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+			"integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"svg-tags": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-			"dev": true
+		"node_modules/is-date-object": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+			"license": "MIT",
+			"dependencies": {
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"svg-to-pdfkit": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/svg-to-pdfkit/-/svg-to-pdfkit-0.1.8.tgz",
-			"integrity": "sha512-QItiGZBy5TstGy+q8mjQTMGRlDDOARXLxH+sgVm1n/LYeo0zFcQlcCh8m4zi8QxctrxB9Kue/lStc/RD5iLadQ==",
-			"requires": {
-				"pdfkit": ">=0.8.1"
+		"node_modules/is-descriptor": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+			"integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+			"license": "MIT",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
-		"svg.js": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/svg.js/-/svg.js-2.7.1.tgz",
-			"integrity": "sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA=="
+		"node_modules/is-directory": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+			"integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"svgo": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-			"integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+		"node_modules/is-docker": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
 			"dev": true,
-			"requires": {
-				"chalk": "^2.4.1",
-				"coa": "^2.0.2",
-				"css-select": "^2.0.0",
-				"css-select-base-adapter": "^0.1.1",
-				"css-tree": "1.0.0-alpha.37",
-				"csso": "^4.0.2",
-				"js-yaml": "^3.13.1",
-				"mkdirp": "~0.5.1",
-				"object.values": "^1.1.0",
-				"sax": "~1.2.4",
-				"stable": "^0.1.8",
-				"unquote": "~1.1.1",
-				"util.promisify": "~1.0.0"
+			"license": "MIT",
+			"bin": {
+				"is-docker": "cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"symbol-observable": {
+		"node_modules/is-extendable": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-			"integrity": "sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+			"license": "MIT",
+			"dependencies": {
+				"is-plain-object": "^2.0.4"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"symbol-tree": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+			"devOptional": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"table": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-			"integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+		"node_modules/is-finite": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+			"integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"ajv": "^5.2.3",
-				"ajv-keywords": "^2.1.0",
-				"chalk": "^2.1.0",
-				"lodash": "^4.17.4",
-				"slice-ansi": "1.0.0",
-				"string-width": "^2.1.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"ajv-keywords": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-					"integrity": "sha512-ZFztHzVRdGLAzJmpUT9LNFLe1YiVOEylcaNpEutM26PVTCtOD919IMfD01CgbRouB42Dd9atjx1HseC15DgOZA==",
-					"dev": true,
-					"optional": true
-				},
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true,
-					"optional": true
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
-					"dev": true,
-					"optional": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true,
-					"optional": true
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
-					"dev": true,
-					"optional": true
-				},
-				"slice-ansi": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"tapable": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-			"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-			"dev": true
-		},
-		"tar-fs": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"chownr": "^1.1.1",
-				"mkdirp-classic": "^0.5.2",
-				"pump": "^3.0.0",
-				"tar-stream": "^2.1.4"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"tar-stream": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"bl": "^4.0.3",
-				"end-of-stream": "^1.4.1",
-				"fs-constants": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^3.1.1"
+		"node_modules/is-generator-function": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+			"license": "MIT",
+			"dependencies": {
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"devOptional": true,
+			"license": "MIT",
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"terser": {
-			"version": "4.8.1",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
-			"integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
+		"node_modules/is-installed-globally": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+			"integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
 			"dev": true,
-			"requires": {
-				"commander": "^2.20.0",
-				"source-map": "~0.6.1",
-				"source-map-support": "~0.5.12"
+			"license": "MIT",
+			"dependencies": {
+				"global-dirs": "^3.0.0",
+				"is-path-inside": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"terser-webpack-plugin": {
-			"version": "1.4.5",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-			"integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
+		"node_modules/is-map": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+			"integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-negative-zero": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+			"integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
 			"dev": true,
-			"requires": {
-				"cacache": "^12.0.2",
-				"find-cache-dir": "^2.1.0",
-				"is-wsl": "^1.1.0",
-				"schema-utils": "^1.0.0",
-				"serialize-javascript": "^4.0.0",
-				"source-map": "^0.6.1",
-				"terser": "^4.1.2",
-				"webpack-sources": "^1.4.0",
-				"worker-farm": "^1.7.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-number": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+			"integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+			"license": "MIT",
 			"dependencies": {
-				"find-cache-dir": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^2.0.0",
-						"pkg-dir": "^3.0.0"
-					}
-				},
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"make-dir": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-					"dev": true,
-					"requires": {
-						"pify": "^4.0.1",
-						"semver": "^5.6.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
-				},
-				"schema-utils": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
-					}
-				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				}
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-			"dev": true
+		"node_modules/is-number-object": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+			"integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+			"license": "MIT",
+			"dependencies": {
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"thenify": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-			"integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-			"dev": true,
-			"requires": {
-				"any-promise": "^1.0.0"
+		"node_modules/is-number/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"license": "MIT",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"thenify-all": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-			"integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+		"node_modules/is-obj": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+			"integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
 			"dev": true,
-			"requires": {
-				"thenify": ">= 3.1.0 < 4"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"thread-loader": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz",
-			"integrity": "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==",
+		"node_modules/is-path-cwd": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
 			"dev": true,
-			"requires": {
-				"loader-runner": "^2.3.1",
-				"loader-utils": "^1.1.0",
-				"neo-async": "^2.6.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"throttleit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-			"integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==",
-			"dev": true
+		"node_modules/is-path-in-cwd": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+			"integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-path-inside": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-			"dev": true
+		"node_modules/is-path-in-cwd/node_modules/is-path-inside": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+			"integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"path-is-inside": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"node_modules/is-path-inside": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
 			"dev": true,
-			"requires": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"thunky": {
+		"node_modules/is-plain-obj": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-			"dev": true
-		},
-		"timers-browserify": {
-			"version": "2.0.12",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
 			"dev": true,
-			"requires": {
-				"setimmediate": "^1.0.4"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"timsort": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-			"integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
-			"dev": true
+		"node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"license": "MIT",
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"tiny-cookie": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tiny-cookie/-/tiny-cookie-1.0.1.tgz",
-			"integrity": "sha512-4KJ21HYTNumxnHvCbLrtrrhSwtWXzpmaRJIUg4biBii5AiSe2izod5bauXiiQxVuf2Fta57U2DTW1Fa4/6Cmgw=="
+		"node_modules/is-promise": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+			"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"tiny-inflate": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
-			"integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="
+		"node_modules/is-regex": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-resolvable": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+			"integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+			"dev": true,
+			"license": "ISC"
 		},
-		"tinyqueue": {
+		"node_modules/is-set": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
-			"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
+			"resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+			"integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"tmp": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
-			"integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",
-			"dev": true,
-			"requires": {
-				"rimraf": "^2.6.3"
+		"node_modules/is-shared-array-buffer": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+			"integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"to-arraybuffer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-			"integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
-			"dev": true
+		"node_modules/is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-			"dev": true
+		"node_modules/is-string": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+			"license": "MIT",
+			"dependencies": {
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
-			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
+		"node_modules/is-symbol": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+			"integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+			"license": "MIT",
+			"dependencies": {
+				"has-symbols": "^1.0.2"
 			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-typed-array": {
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+			"integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+			"license": "MIT",
 			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"which-typed-array": "^1.1.14"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+		"node_modules/is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
 			"dev": true,
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			}
+			"license": "MIT"
 		},
-		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+		"node_modules/is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
 			"dev": true,
-			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"toidentifier": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-			"dev": true
+		"node_modules/is-valid-glob": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+			"integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"toposort": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
-			"integrity": "sha512-FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg==",
-			"dev": true
+		"node_modules/is-weakmap": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+			"integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"tough-cookie": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+		"node_modules/is-weakref": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+			"integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
 			"dev": true,
-			"requires": {
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"tr46": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-			"integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
+		"node_modules/is-weakset": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
+			"integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"get-intrinsic": "^1.2.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-whitespace": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
+			"integrity": "sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==",
 			"dev": true,
-			"requires": {
-				"punycode": "^2.1.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"tryer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-			"dev": true
+		"node_modules/is-windows": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"ts-pnp": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
-			"integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
-			"dev": true
+		"node_modules/is-wsl": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-docker": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"tslib": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+		"node_modules/isarray": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+			"license": "MIT"
 		},
-		"tty-browserify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-			"integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
-			"dev": true
-		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
 			"dev": true,
-			"requires": {
-				"safe-buffer": "^5.0.1"
+			"license": "ISC"
+		},
+		"node_modules/isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-			"dev": true
+		"node_modules/isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+		"node_modules/jackspeak": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
 			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2"
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			},
+			"optionalDependencies": {
+				"@pkgjs/parseargs": "^0.11.0"
 			}
 		},
-		"type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
-		},
-		"type-fest": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-			"dev": true
+		"node_modules/javascript-natural-sort": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+			"integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
+			"license": "MIT"
 		},
-		"type-is": {
-			"version": "1.6.18",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+		"node_modules/javascript-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
+			"integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
 			"dev": true,
-			"requires": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.24"
-			}
-		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-			"dev": true
+			"license": "MIT"
 		},
-		"uglify-js": {
-			"version": "3.4.10",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-			"integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+		"node_modules/jest-worker": {
+			"version": "25.5.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+			"integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
 			"dev": true,
-			"requires": {
-				"commander": "~2.19.0",
-				"source-map": "~0.6.1"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-					"dev": true
-				}
+				"merge-stream": "^2.0.0",
+				"supports-color": "^7.0.0"
+			},
+			"engines": {
+				"node": ">= 8.3"
 			}
 		},
-		"uiv": {
-			"version": "0.27.0",
-			"resolved": "https://registry.npmjs.org/uiv/-/uiv-0.27.0.tgz",
-			"integrity": "sha512-4kO9oGekQ/sXVTz7KdxnOwXcTfWGnwZzbstSWQEP9PokfHQ0W0dwbiXW93t6qSB/hVVSRifF7Tvv2pLLVevftA==",
-			"requires": {
-				"vue-functional-data-merge": "^2.0.3"
+		"node_modules/jest-worker/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"unbox-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-			"integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-bigints": "^1.0.2",
-				"has-symbols": "^1.0.3",
-				"which-boxed-primitive": "^1.0.2"
+		"node_modules/jest-worker/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"underscore": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-			"integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
-		},
-		"unicode-canonical-property-names-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-			"dev": true
+		"node_modules/jmespath": {
+			"version": "0.15.0",
+			"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+			"integrity": "sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w==",
+			"engines": {
+				"node": ">= 0.6.0"
+			}
 		},
-		"unicode-match-property-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+		"node_modules/js-beautify": {
+			"version": "1.15.1",
+			"resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.1.tgz",
+			"integrity": "sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==",
 			"dev": true,
-			"requires": {
-				"unicode-canonical-property-names-ecmascript": "^2.0.0",
-				"unicode-property-aliases-ecmascript": "^2.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"config-chain": "^1.1.13",
+				"editorconfig": "^1.0.4",
+				"glob": "^10.3.3",
+				"js-cookie": "^3.0.5",
+				"nopt": "^7.2.0"
+			},
+			"bin": {
+				"css-beautify": "js/bin/css-beautify.js",
+				"html-beautify": "js/bin/html-beautify.js",
+				"js-beautify": "js/bin/js-beautify.js"
+			},
+			"engines": {
+				"node": ">=14"
 			}
 		},
-		"unicode-match-property-value-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-			"dev": true
-		},
-		"unicode-properties": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
-			"integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
-			"requires": {
-				"base64-js": "^1.3.0",
-				"unicode-trie": "^2.0.0"
-			},
+		"node_modules/js-beautify/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"base64-js": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-					"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-				}
+				"balanced-match": "^1.0.0"
 			}
 		},
-		"unicode-property-aliases-ecmascript": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-			"dev": true
-		},
-		"unicode-trie": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
-			"integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
-			"requires": {
-				"pako": "^0.2.5",
-				"tiny-inflate": "^1.0.0"
+		"node_modules/js-beautify/node_modules/glob": {
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"foreground-child": "^3.1.0",
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
+			},
+			"bin": {
+				"glob": "dist/esm/bin.mjs"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"union-value": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+		"node_modules/js-beautify/node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^2.0.1"
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"uniq": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-			"integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==",
-			"dev": true
-		},
-		"uniqs": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-			"integrity": "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==",
-			"dev": true
-		},
-		"unique-filename": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+		"node_modules/js-beautify/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
-			"requires": {
-				"unique-slug": "^2.0.0"
+			"license": "ISC",
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
 			}
 		},
-		"unique-slug": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-			"integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+		"node_modules/js-cookie": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+			"integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
 			"dev": true,
-			"requires": {
-				"imurmurhash": "^0.1.4"
+			"license": "MIT",
+			"engines": {
+				"node": ">=14"
 			}
 		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-			"dev": true
-		},
-		"unpipe": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-			"dev": true
-		},
-		"unquote": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-			"integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
-			"dev": true
-		},
-		"unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+		"node_modules/js-levenshtein": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+			"integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
 			"dev": true,
-			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-					"dev": true,
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-							"dev": true,
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-					"dev": true
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"untildify": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
-			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
-			"dev": true
-		},
-		"upath": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-			"dev": true
-		},
-		"update-browserslist-db": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-			"integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+		"node_modules/js-message": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz",
+			"integrity": "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==",
 			"dev": true,
-			"requires": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.6.0"
 			}
 		},
-		"upper-case": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-			"integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
-			"dev": true
-		},
-		"uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"requires": {
-				"punycode": "^2.1.0"
+		"node_modules/js-queue": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/js-queue/-/js-queue-2.0.2.tgz",
+			"integrity": "sha512-pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"easy-stack": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=1.0.0"
 			}
 		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
-			"dev": true
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"url": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+		"node_modules/js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"dev": true,
-			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
-					"dev": true
-				}
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"url-loader": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz",
-			"integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==",
+		"node_modules/jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
 			"dev": true,
-			"requires": {
-				"loader-utils": "^1.2.3",
-				"mime": "^2.4.4",
-				"schema-utils": "^2.5.0"
-			}
+			"license": "MIT"
 		},
-		"url-parse": {
-			"version": "1.5.10",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-			"requires": {
-				"querystringify": "^2.1.1",
-				"requires-port": "^1.0.0"
+		"node_modules/jsdom": {
+			"version": "13.2.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz",
+			"integrity": "sha512-cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"abab": "^2.0.0",
+				"acorn": "^6.0.4",
+				"acorn-globals": "^4.3.0",
+				"array-equal": "^1.0.0",
+				"cssom": "^0.3.4",
+				"cssstyle": "^1.1.1",
+				"data-urls": "^1.1.0",
+				"domexception": "^1.0.1",
+				"escodegen": "^1.11.0",
+				"html-encoding-sniffer": "^1.0.2",
+				"nwsapi": "^2.0.9",
+				"parse5": "5.1.0",
+				"pn": "^1.1.0",
+				"request": "^2.88.0",
+				"request-promise-native": "^1.0.5",
+				"saxes": "^3.1.5",
+				"symbol-tree": "^3.2.2",
+				"tough-cookie": "^2.5.0",
+				"w3c-hr-time": "^1.0.1",
+				"w3c-xmlserializer": "^1.0.1",
+				"webidl-conversions": "^4.0.2",
+				"whatwg-encoding": "^1.0.5",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^7.0.0",
+				"ws": "^6.1.2",
+				"xml-name-validator": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-			"dev": true
+		"node_modules/jsdom-global": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/jsdom-global/-/jsdom-global-3.0.2.tgz",
+			"integrity": "sha512-t1KMcBkz/pT5JrvcJbpUR2u/w1kO9jXctaaGJ0vZDzwFnIvGWw9IDSRciT83kIs8Bnw4qpOl8bQK08V01YgMPg==",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"jsdom": ">=10.0.0"
+			}
 		},
-		"util": {
-			"version": "0.12.3",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.3.tgz",
-			"integrity": "sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==",
-			"requires": {
-				"inherits": "^2.0.3",
-				"is-arguments": "^1.0.4",
-				"is-generator-function": "^1.0.7",
-				"is-typed-array": "^1.1.3",
-				"safe-buffer": "^5.1.2",
-				"which-typed-array": "^1.1.2"
+		"node_modules/jsdom/node_modules/acorn": {
+			"version": "6.4.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
 			}
 		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+		"node_modules/jsdom/node_modules/parse5": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+			"integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"util.promisify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-			"integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+		"node_modules/jsdom/node_modules/tough-cookie": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"psl": "^1.1.28",
+				"punycode": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
 			"dev": true,
-			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.2",
-				"has-symbols": "^1.0.1",
-				"object.getownpropertydescriptors": "^2.1.0"
+			"license": "MIT",
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"utila": {
+		"node_modules/json-parse-better-errors": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+			"license": "MIT"
+		},
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/json-schema": {
 			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-			"integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+			"integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+			"dev": true,
+			"license": "(AFL-2.1 OR BSD-3-Clause)"
+		},
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"license": "MIT"
+		},
+		"node_modules/json-source-map": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/json-source-map/-/json-source-map-0.4.0.tgz",
+			"integrity": "sha512-fVJ2mGl6pmYNmgseQch8X1ghdDntxeYgQQueypu9ZvttZwlSQuW4QztPBxgomRiRBidj5g7PtTW+7EqsTnEDNw==",
+			"license": "MIT"
 		},
-		"utils-merge": {
+		"node_modules/json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"uuid": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-			"dev": true
+		"node_modules/json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+			"dev": true,
+			"license": "ISC"
 		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+		"node_modules/json5": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
 			"dev": true,
-			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
+			"license": "MIT",
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vanilla-picker": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.8.0.tgz",
-			"integrity": "sha512-NPBxrtLi2LA2mEyRLW+Lyt7Eqtm0t0SmKqscE5RaugXLtJXXjPzy6r65fqLiQkhRc2WoLnmj2m/EnTWKN4hL+g==",
-			"requires": {
-				"@sphinxxxx/color-conversion": "^2.2.1",
-				"drag-tracker": "^1.0.0"
+		"node_modules/jsoneditor": {
+			"version": "5.34.0",
+			"resolved": "https://registry.npmjs.org/jsoneditor/-/jsoneditor-5.34.0.tgz",
+			"integrity": "sha512-/F7L6oXuRkv2/FKFIL4NMWF0P+oVvSWLJPVEVP/7KGehBj6dtOp5FKdfLcNkIgbqzklXx/NDzHSXYlf64wqmuQ==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"ajv": "5.5.2",
+				"brace": "0.11.1",
+				"javascript-natural-sort": "0.7.1",
+				"jmespath": "0.15.0",
+				"json-source-map": "0.4.0",
+				"mobius1-selectr": "2.4.10",
+				"picomodal": "3.0.0",
+				"vanilla-picker": "2.8.0"
 			}
 		},
-		"vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-			"dev": true
+		"node_modules/jsoneditor/node_modules/ajv": {
+			"version": "5.5.2",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+			"integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
+			"license": "MIT",
+			"dependencies": {
+				"co": "^4.6.0",
+				"fast-deep-equal": "^1.0.0",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.3.0"
+			}
 		},
-		"vendors": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-			"integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-			"dev": true
+		"node_modules/jsoneditor/node_modules/fast-deep-equal": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+			"integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==",
+			"license": "MIT"
 		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+		"node_modules/jsoneditor/node_modules/json-schema-traverse": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+			"integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==",
+			"license": "MIT"
+		},
+		"node_modules/jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
 			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+			"license": "MIT",
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
 			}
 		},
-		"vm-browserify": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-			"dev": true
+		"node_modules/jsprim": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
+			"integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
+			"dev": true,
+			"engines": [
+				"node >=0.6.0"
+			],
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.4.0",
+				"verror": "1.10.0"
+			}
 		},
-		"vue": {
-			"version": "2.6.10",
-			"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
-			"integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
+		"node_modules/just-extend": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz",
+			"integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==",
+			"license": "MIT"
 		},
-		"vue-class-component": {
-			"version": "6.3.2",
-			"resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
-			"integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A=="
+		"node_modules/keytar": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/keytar/-/keytar-6.0.1.tgz",
+			"integrity": "sha512-1Ihpf2tdM3sLwGMkYHXYhVC/hx5BDR7CWFL4IrBA3IDZo0xHhS2nM+tU9Y+u/U7okNfbVkwmKsieLkcWRMh93g==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"node-addon-api": "^3.0.0",
+				"prebuild-install": "5.3.4"
+			}
 		},
-		"vue-cli-plugin-i18n": {
+		"node_modules/killable": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-1.0.1.tgz",
-			"integrity": "sha512-sLo6YzudaWgn5dOMvrKixE5bb/onYGxcxm+0YexqoOx0QtR+7hZ/P5WPFBMM9v/2i1ec2YYe2PvKTBel7KE+tA==",
+			"resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+			"integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
 			"dev": true,
-			"requires": {
-				"debug": "^4.1.0",
-				"deepmerge": "^4.2.0",
-				"dotenv": "^8.2.0",
-				"flat": "^5.0.0",
-				"rimraf": "^3.0.0",
-				"vue": "^2.6.11",
-				"vue-i18n": "^8.17.0",
-				"vue-i18n-extract": "1.0.2"
+			"license": "ISC"
+		},
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/launch-editor": {
+			"version": "2.9.1",
+			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
+			"integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"picocolors": "^1.0.0",
+				"shell-quote": "^1.8.1"
+			}
+		},
+		"node_modules/launch-editor-middleware": {
+			"version": "2.9.1",
+			"resolved": "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.9.1.tgz",
+			"integrity": "sha512-4wF6AtPtaIENiZdH/a+3yW8Xni7uxzTEDd1z+gH00hUWBCSmQknFohznMd9BWhLk8MXObeB5ir69GbIr9qFW1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"launch-editor": "^2.9.1"
+			}
+		},
+		"node_modules/lazy-ass": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
+			"integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "> 0.8"
+			}
+		},
+		"node_modules/lcid": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+			"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"invert-kv": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+			"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/linebreak": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/linebreak/-/linebreak-1.1.0.tgz",
+			"integrity": "sha512-MHp03UImeVhB7XZtjd0E4n6+3xr5Dq/9xI/5FptGk5FrbDR3zagPa2DS6U8ks/3HjbKWG9Q1M2ufOzxV2qLYSQ==",
+			"license": "MIT",
+			"dependencies": {
+				"base64-js": "0.0.8",
+				"unicode-trie": "^2.0.0"
+			}
+		},
+		"node_modules/linebreak/node_modules/base64-js": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+			"integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/lines-and-columns": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/listr": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
+			"integrity": "sha512-5GlrcOoGOBd/hFSI7hMvVXb+5jFMVc17e1VQzpa7VJna1SDTYSCrCpqBQUkuWW18xibTR+PQndjVtuEBKtOWVw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^1.1.3",
+				"cli-truncate": "^0.2.1",
+				"figures": "^1.7.0",
+				"indent-string": "^2.1.0",
+				"is-promise": "^2.1.0",
+				"is-stream": "^1.1.0",
+				"listr-silent-renderer": "^1.1.1",
+				"listr-update-renderer": "^0.2.0",
+				"listr-verbose-renderer": "^0.4.0",
+				"log-symbols": "^1.0.2",
+				"log-update": "^1.0.2",
+				"ora": "^0.2.3",
+				"p-map": "^1.1.1",
+				"rxjs": "^5.0.0-beta.11",
+				"stream-to-observable": "^0.1.0",
+				"strip-ansi": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/listr-silent-renderer": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
+			"integrity": "sha512-L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/listr-update-renderer": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
+			"integrity": "sha512-0G/CLBomVga7gpCMHw5Adg9kafRz0HDAOxa1GrWywXr1oNYRW/n4pPy7xF/hniRCLRCorZMCxaMGSmgsp1QHsA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^1.1.3",
+				"cli-truncate": "^0.2.1",
+				"elegant-spinner": "^1.0.1",
+				"figures": "^1.7.0",
+				"indent-string": "^3.0.0",
+				"log-symbols": "^1.0.2",
+				"log-update": "^1.0.2",
+				"strip-ansi": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/ansi-escapes": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+			"integrity": "sha512-wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/cli-cursor": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+			"integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"restore-cursor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/cli-truncate": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
+			"integrity": "sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"slice-ansi": "0.0.4",
+				"string-width": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/figures": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+			"integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5",
+				"object-assign": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/indent-string": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+			"integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/is-fullwidth-code-point": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+			"integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"number-is-nan": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/log-symbols": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+			"integrity": "sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/log-update": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
+			"integrity": "sha512-4vSow8gbiGnwdDNrpy1dyNaXWKSCIPop0EHdE8GrnngHoJujM3QhvHUN/igsYCgPoHo7pFOezlJ61Hlln0KHyA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-escapes": "^1.0.0",
+				"cli-cursor": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/onetime": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+			"integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/restore-cursor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+			"integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"exit-hook": "^1.0.0",
+				"onetime": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/slice-ansi": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+			"integrity": "sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/string-width": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"code-point-at": "^1.0.0",
+				"is-fullwidth-code-point": "^1.0.0",
+				"strip-ansi": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-update-renderer/node_modules/supports-color": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
+			"integrity": "sha512-tWEhvyB9UUq+4fkEwQ2NQK2JfYhsc3slSeYRkuc9CiJ3GFMRa5CRUcmqo+IIF+L95uZqv5dzZDC6vCggC28C0g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^1.1.3",
+				"cli-cursor": "^1.0.2",
+				"date-fns": "^1.27.2",
+				"figures": "^1.7.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/cli-cursor": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+			"integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"restore-cursor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/figures": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+			"integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5",
+				"object-assign": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/onetime": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+			"integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/restore-cursor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+			"integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"exit-hook": "^1.0.0",
+				"onetime": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr-verbose-renderer/node_modules/supports-color": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/listr/node_modules/ansi-escapes": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+			"integrity": "sha512-wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/cli-cursor": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+			"integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"restore-cursor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/cli-spinners": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
+			"integrity": "sha512-t22oC6e068eEBQ86SO3arUtd1ojcA3/lz3Fp2g/oL/lmDlFz/2yD8JHiebeCGYmoAovYpwKq4T64Uq5j+28Q9w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/cli-truncate": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
+			"integrity": "sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"slice-ansi": "0.0.4",
+				"string-width": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/figures": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+			"integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5",
+				"object-assign": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/indent-string": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+			"integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"repeating": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/is-fullwidth-code-point": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+			"integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"number-is-nan": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/log-symbols": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+			"integrity": "sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/log-update": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
+			"integrity": "sha512-4vSow8gbiGnwdDNrpy1dyNaXWKSCIPop0EHdE8GrnngHoJujM3QhvHUN/igsYCgPoHo7pFOezlJ61Hlln0KHyA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-escapes": "^1.0.0",
+				"cli-cursor": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/onetime": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+			"integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/ora": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
+			"integrity": "sha512-MYGyg17e2GcoDlFrAP39zu4nrAQ+STzl4fosWjR8vAlT0a2wKuuAGZTecffdVLPsnEfxXVlrUcDZ1DU5skr+QQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^1.1.1",
+				"cli-cursor": "^1.0.2",
+				"cli-spinners": "^0.1.2",
+				"object-assign": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/p-map": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/listr/node_modules/restore-cursor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+			"integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"exit-hook": "^1.0.0",
+				"onetime": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/rxjs": {
+			"version": "5.5.12",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+			"integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"symbol-observable": "1.0.1"
+			},
+			"engines": {
+				"npm": ">=2.0.0"
+			}
+		},
+		"node_modules/listr/node_modules/slice-ansi": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+			"integrity": "sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/string-width": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"code-point-at": "^1.0.0",
+				"is-fullwidth-code-point": "^1.0.0",
+				"strip-ansi": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/listr/node_modules/supports-color": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/listr2": {
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+			"integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cli-truncate": "^2.1.0",
+				"colorette": "^2.0.16",
+				"log-update": "^4.0.0",
+				"p-map": "^4.0.0",
+				"rfdc": "^1.3.0",
+				"rxjs": "^7.5.1",
+				"through": "^2.3.8",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"enquirer": ">= 2.3.0 < 3"
+			},
+			"peerDependenciesMeta": {
+				"enquirer": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/listr2/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/listr2/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/listr2/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/listr2/node_modules/rxjs": {
+			"version": "7.8.1",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"tslib": "^2.1.0"
+			}
+		},
+		"node_modules/listr2/node_modules/tslib": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+			"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+			"dev": true,
+			"license": "0BSD"
+		},
+		"node_modules/listr2/node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/loader-fs-cache": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz",
+			"integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"find-cache-dir": "^0.1.1",
+				"mkdirp": "^0.5.1"
+			}
+		},
+		"node_modules/loader-fs-cache/node_modules/find-cache-dir": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
+			"integrity": "sha512-Z9XSBoNE7xQiV6MSgPuCfyMokH2K7JdpRkOYE1+mu3d4BFJtx3GW+f6Bo4q8IX6rlf5MYbLBKW0pjl2cWdkm2A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"commondir": "^1.0.1",
+				"mkdirp": "^0.5.1",
+				"pkg-dir": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/loader-fs-cache/node_modules/find-up": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+			"integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"path-exists": "^2.0.0",
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/loader-fs-cache/node_modules/path-exists": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+			"integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/loader-fs-cache/node_modules/pkg-dir": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+			"integrity": "sha512-c6pv3OE78mcZ92ckebVDqg0aWSoKhOTbwCV6qbCWMk546mAL9pZln0+QsN/yQ7fkucd4+yJPLrCBXNt8Ruk+Eg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"find-up": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/loader-runner": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+			"integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4.3.0 <5.0.0 || >=5.10"
+			}
+		},
+		"node_modules/loader-utils": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^2.1.2"
+			},
+			"engines": {
+				"node": ">=8.9.0"
+			}
+		},
+		"node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"license": "MIT"
+		},
+		"node_modules/lodash.debounce": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.defaultsdeep": {
+			"version": "4.6.1",
+			"resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
+			"integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.get": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+			"integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+			"license": "MIT"
+		},
+		"node_modules/lodash.kebabcase": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
+			"integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.mapvalues": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
+			"integrity": "sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.once": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+			"integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.sortby": {
+			"version": "4.7.0",
+			"resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+			"integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.transform": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
+			"integrity": "sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.uniq": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/log-symbols/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/log-symbols/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/log-symbols/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/log-symbols/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/log-symbols/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/log-symbols/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/log-update": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+			"integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-escapes": "^4.3.0",
+				"cli-cursor": "^3.1.0",
+				"slice-ansi": "^4.0.0",
+				"wrap-ansi": "^6.2.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/log-update/node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"type-fest": "^0.21.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/log-update/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/log-update/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/log-update/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/log-update/node_modules/slice-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/slice-ansi?sponsor=1"
+			}
+		},
+		"node_modules/log-update/node_modules/type-fest": {
+			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/loglevel": {
+			"version": "1.9.2",
+			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz",
+			"integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6.0"
+			},
+			"funding": {
+				"type": "tidelift",
+				"url": "https://tidelift.com/funding/github/npm/loglevel"
+			}
+		},
+		"node_modules/loose-envify": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"js-tokens": "^3.0.0 || ^4.0.0"
+			},
+			"bin": {
+				"loose-envify": "cli.js"
+			}
+		},
+		"node_modules/lower-case": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+			"integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lru-cache": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+			"license": "ISC",
+			"dependencies": {
+				"yallist": "^3.0.2"
+			}
+		},
+		"node_modules/make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"semver": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/map-age-cleaner": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+			"integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-defer": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/map-cache": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+			"integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/map-visit": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+			"integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+			"license": "MIT",
+			"dependencies": {
+				"object-visit": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/md5": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+			"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"charenc": "0.0.2",
+				"crypt": "0.0.2",
+				"is-buffer": "~1.1.6"
+			}
+		},
+		"node_modules/md5.js": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+			"license": "MIT",
+			"dependencies": {
+				"hash-base": "^3.0.0",
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.1.2"
+			}
+		},
+		"node_modules/mdn-data": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+			"integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+			"dev": true,
+			"license": "CC0-1.0"
+		},
+		"node_modules/media-typer": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mem": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+			"integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"map-age-cleaner": "^0.1.1",
+				"mimic-fn": "^2.0.0",
+				"p-is-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/memory-fs": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+			"integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==",
+			"license": "MIT",
+			"dependencies": {
+				"errno": "^0.1.3",
+				"readable-stream": "^2.0.1"
+			}
+		},
+		"node_modules/merge-descriptors": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+			"integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/merge-source-map": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+			"integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+			"license": "MIT",
+			"dependencies": {
+				"source-map": "^0.6.1"
+			}
+		},
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/methods": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/micromatch": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"license": "MIT",
+			"dependencies": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/miller-rabin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+			"license": "MIT",
+			"dependencies": {
+				"bn.js": "^4.0.0",
+				"brorand": "^1.0.1"
+			},
+			"bin": {
+				"miller-rabin": "bin/miller-rabin"
+			}
+		},
+		"node_modules/miller-rabin/node_modules/bn.js": {
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"license": "MIT"
+		},
+		"node_modules/mime": {
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+			"integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/mimic-response": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+			"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/mini-css-extract-plugin": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+			"integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^1.1.0",
+				"normalize-url": "1.9.1",
+				"schema-utils": "^1.0.0",
+				"webpack-sources": "^1.1.0"
+			},
+			"engines": {
+				"node": ">= 6.9.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.4.0"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+			"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^6.1.0",
+				"ajv-errors": "^1.0.0",
+				"ajv-keywords": "^3.1.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/minimalistic-assert": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+			"license": "ISC"
+		},
+		"node_modules/minimalistic-crypto-utils": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+			"integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+			"license": "MIT"
+		},
+		"node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/minimist": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/minipass": {
+			"version": "3.3.6",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+			"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/minipass-collect": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+			"integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"minipass": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/minipass-flush": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+			"integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"minipass": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/minipass-pipeline": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+			"integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"minipass": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/minipass/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/mississippi": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+			"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"concat-stream": "^1.5.0",
+				"duplexify": "^3.4.2",
+				"end-of-stream": "^1.1.0",
+				"flush-write-stream": "^1.0.0",
+				"from2": "^2.1.0",
+				"parallel-transform": "^1.1.0",
+				"pump": "^3.0.0",
+				"pumpify": "^1.3.3",
+				"stream-each": "^1.1.0",
+				"through2": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/mixin-deep": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+			"license": "MIT",
+			"dependencies": {
+				"for-in": "^1.0.2",
+				"is-extendable": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mkdirp": {
+			"version": "0.5.6",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.6"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			}
+		},
+		"node_modules/mkdirp-classic": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/mobius1-selectr": {
+			"version": "2.4.10",
+			"resolved": "https://registry.npmjs.org/mobius1-selectr/-/mobius1-selectr-2.4.10.tgz",
+			"integrity": "sha512-U/pQ8jZwO7z3Mf9OYzJR6AKfleF5jSBIueKKxGMr/tgyLuTWgchgFyeaXpAIz3Cbp+7eIN1hw5D2gxc4cNnOkQ==",
+			"license": "MIT"
+		},
+		"node_modules/mocha": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+			"integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"browser-stdout": "1.3.1",
+				"commander": "2.15.1",
+				"debug": "3.1.0",
+				"diff": "3.5.0",
+				"escape-string-regexp": "1.0.5",
+				"glob": "7.1.2",
+				"growl": "1.10.5",
+				"he": "1.1.1",
+				"minimatch": "3.0.4",
+				"mkdirp": "0.5.1",
+				"supports-color": "5.4.0"
+			},
+			"bin": {
+				"_mocha": "bin/_mocha",
+				"mocha": "bin/mocha"
+			},
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
+		"node_modules/mocha-junit-reporter": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.0.0.tgz",
+			"integrity": "sha512-20HoWh2HEfhqmigfXOKUhZQyX23JImskc37ZOhIjBKoBEsb+4cAFRJpAVhFpnvsztLklW/gFVzsrobjLwmX4lA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^2.2.0",
+				"md5": "^2.1.0",
+				"mkdirp": "~0.5.1",
+				"strip-ansi": "^4.0.0",
+				"xml": "^1.0.0"
+			},
+			"peerDependencies": {
+				"mocha": ">=2.2.5"
+			}
+		},
+		"node_modules/mocha-junit-reporter/node_modules/ansi-regex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+			"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-junit-reporter/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/mocha-junit-reporter/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/mocha-junit-reporter/node_modules/strip-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack": {
+			"version": "2.0.0-beta.0",
+			"resolved": "https://registry.npmjs.org/mocha-webpack/-/mocha-webpack-2.0.0-beta.0.tgz",
+			"integrity": "sha512-2ezbW0h5cYWr874F/hzytQCqINxk+GVelMY4xWTSHwwH1LrPAOzjlUljZ+/PhpaP6QeqYbL5x5vK/bnaXqkfEw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"babel-runtime": "^6.18.0",
+				"chalk": "^2.3.0",
+				"chokidar": "^2.0.2",
+				"glob-parent": "^3.1.0",
+				"globby": "^7.1.1",
+				"interpret": "^1.0.1",
+				"is-glob": "^4.0.0",
+				"loader-utils": "^1.1.0",
+				"lodash": "^4.3.0",
+				"memory-fs": "^0.4.1",
+				"nodent-runtime": "^3.0.3",
+				"normalize-path": "^2.0.1",
+				"progress": "^2.0.0",
+				"source-map-support": "^0.5.0",
+				"strip-ansi": "^4.0.0",
+				"toposort": "^1.0.0",
+				"yargs": "^11.0.0"
+			},
+			"bin": {
+				"mocha-webpack": "bin/mocha-webpack"
+			},
+			"peerDependencies": {
+				"mocha": ">=4 <=5",
+				"webpack": "^4.0.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/ansi-regex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+			"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/camelcase": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+			"integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/cliui": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+			"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"string-width": "^2.1.1",
+				"strip-ansi": "^4.0.0",
+				"wrap-ansi": "^2.0.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/find-up": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+			"integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/get-caller-file": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/mocha-webpack/node_modules/globby": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+			"integrity": "sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"array-union": "^1.0.1",
+				"dir-glob": "^2.0.0",
+				"glob": "^7.1.2",
+				"ignore": "^3.3.5",
+				"pify": "^3.0.0",
+				"slash": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/ignore": {
+			"version": "3.3.10",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+			"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/mocha-webpack/node_modules/is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/locate-path": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+			"integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^2.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/normalize-path": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+			"integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"remove-trailing-separator": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/p-limit": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+			"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-try": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/p-locate": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+			"integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/p-try": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+			"integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/slash": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+			"integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/string-width": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/strip-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/wrap-ansi": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+			"integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/wrap-ansi/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+			"integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"number-is-nan": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/wrap-ansi/node_modules/string-width": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"code-point-at": "^1.0.0",
+				"is-fullwidth-code-point": "^1.0.0",
+				"strip-ansi": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/wrap-ansi/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/y18n": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+			"integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/mocha-webpack/node_modules/yargs": {
+			"version": "11.1.1",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+			"integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cliui": "^4.0.0",
+				"decamelize": "^1.1.1",
+				"find-up": "^2.1.0",
+				"get-caller-file": "^1.0.1",
+				"os-locale": "^3.1.0",
+				"require-directory": "^2.1.1",
+				"require-main-filename": "^1.0.1",
+				"set-blocking": "^2.0.0",
+				"string-width": "^2.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^3.2.1",
+				"yargs-parser": "^9.0.2"
+			}
+		},
+		"node_modules/mocha-webpack/node_modules/yargs-parser": {
+			"version": "9.0.2",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+			"integrity": "sha512-CswCfdOgCr4MMsT1GzbEJ7Z2uYudWyrGX8Bgh/0eyCzj/DXWdKq6a/ADufkzI1WAOIW6jYaXJvRyLhDO0kfqBw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"camelcase": "^4.1.0"
+			}
+		},
+		"node_modules/mocha/node_modules/commander": {
+			"version": "2.15.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+			"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/mocha/node_modules/debug": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+			"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/mocha/node_modules/glob": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/mocha/node_modules/he": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+			"integrity": "sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"he": "bin/he"
+			}
+		},
+		"node_modules/mocha/node_modules/minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/mocha/node_modules/minimist": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+			"integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/mocha/node_modules/mkdirp": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+			"integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
+			"deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "0.0.8"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			}
+		},
+		"node_modules/mocha/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/mocha/node_modules/supports-color": {
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+			"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/moment": {
+			"version": "2.22.2",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
+			"integrity": "sha512-LRvkBHaJGnrcWvqsElsOhHCzj8mU39wLx5pQ0pc6s153GynCTsPdGdqsVNKAQD9sKnWj11iF7TZx9fpLwdD3fw==",
+			"license": "MIT",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/move-concurrently": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+			"integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==",
+			"deprecated": "This package is no longer supported.",
+			"license": "ISC",
+			"dependencies": {
+				"aproba": "^1.1.1",
+				"copy-concurrently": "^1.0.0",
+				"fs-write-stream-atomic": "^1.0.8",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.3"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"license": "MIT"
+		},
+		"node_modules/multicast-dns": {
+			"version": "6.2.3",
+			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+			"integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"dns-packet": "^1.3.1",
+				"thunky": "^1.0.2"
+			},
+			"bin": {
+				"multicast-dns": "cli.js"
+			}
+		},
+		"node_modules/multicast-dns-service-types": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+			"integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/mute-stream": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+			"integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/mz": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+			"integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"any-promise": "^1.0.0",
+				"object-assign": "^4.0.1",
+				"thenify-all": "^1.0.0"
+			}
+		},
+		"node_modules/nan": {
+			"version": "2.20.0",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
+			"integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/nanoid": {
+			"version": "3.3.7",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
+		},
+		"node_modules/nanomatch": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"license": "MIT",
+			"dependencies": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/napi-build-utils": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+			"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/negotiator": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/neo-async": {
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+			"license": "MIT"
+		},
+		"node_modules/nice-try": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/nise": {
+			"version": "5.1.9",
+			"resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz",
+			"integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@sinonjs/commons": "^3.0.0",
+				"@sinonjs/fake-timers": "^11.2.2",
+				"@sinonjs/text-encoding": "^0.7.2",
+				"just-extend": "^6.2.0",
+				"path-to-regexp": "^6.2.1"
+			}
+		},
+		"node_modules/nise/node_modules/@sinonjs/commons": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"node_modules/nise/node_modules/@sinonjs/fake-timers": {
+			"version": "11.3.1",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz",
+			"integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@sinonjs/commons": "^3.0.1"
+			}
+		},
+		"node_modules/nise/node_modules/type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/no-case": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+			"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"lower-case": "^1.1.1"
+			}
+		},
+		"node_modules/node-abi": {
+			"version": "2.30.1",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
+			"integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"semver": "^5.4.1"
+			}
+		},
+		"node_modules/node-abi/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"dev": true,
+			"license": "ISC",
+			"optional": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/node-addon-api": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/node-forge": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+			"integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+			"dev": true,
+			"license": "(BSD-3-Clause OR GPL-2.0)",
+			"engines": {
+				"node": ">= 6.0.0"
+			}
+		},
+		"node_modules/node-ipc": {
+			"version": "9.2.1",
+			"resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.2.1.tgz",
+			"integrity": "sha512-mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"event-pubsub": "4.3.0",
+				"js-message": "1.0.7",
+				"js-queue": "2.0.2"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/node-libs-browser": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+			"integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+			"license": "MIT",
+			"dependencies": {
+				"assert": "^1.1.1",
+				"browserify-zlib": "^0.2.0",
+				"buffer": "^4.3.0",
+				"console-browserify": "^1.1.0",
+				"constants-browserify": "^1.0.0",
+				"crypto-browserify": "^3.11.0",
+				"domain-browser": "^1.1.1",
+				"events": "^3.0.0",
+				"https-browserify": "^1.0.0",
+				"os-browserify": "^0.3.0",
+				"path-browserify": "0.0.1",
+				"process": "^0.11.10",
+				"punycode": "^1.2.4",
+				"querystring-es3": "^0.2.0",
+				"readable-stream": "^2.3.3",
+				"stream-browserify": "^2.0.1",
+				"stream-http": "^2.7.2",
+				"string_decoder": "^1.0.0",
+				"timers-browserify": "^2.0.4",
+				"tty-browserify": "0.0.0",
+				"url": "^0.11.0",
+				"util": "^0.11.0",
+				"vm-browserify": "^1.0.1"
+			}
+		},
+		"node_modules/node-libs-browser/node_modules/buffer": {
+			"version": "4.9.2",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+			"integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+			"license": "MIT",
+			"dependencies": {
+				"base64-js": "^1.0.2",
+				"ieee754": "^1.1.4",
+				"isarray": "^1.0.0"
+			}
+		},
+		"node_modules/node-libs-browser/node_modules/inherits": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+			"license": "ISC"
+		},
+		"node_modules/node-libs-browser/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"license": "MIT"
+		},
+		"node_modules/node-libs-browser/node_modules/punycode": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+			"license": "MIT"
+		},
+		"node_modules/node-libs-browser/node_modules/util": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "2.0.3"
+			}
+		},
+		"node_modules/node-releases": {
+			"version": "2.0.18",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+			"integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/nodent-runtime": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/nodent-runtime/-/nodent-runtime-3.2.1.tgz",
+			"integrity": "sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT"
+		},
+		"node_modules/noop-logger": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+			"integrity": "sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/nopt": {
+			"version": "7.2.1",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
+			"integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"abbrev": "^2.0.0"
+			},
+			"bin": {
+				"nopt": "bin/nopt.js"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
+		"node_modules/normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
+		"node_modules/normalize-package-data/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/normalize-range": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/normalize-url": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+			"integrity": "sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"object-assign": "^4.0.1",
+				"prepend-http": "^1.0.0",
+				"query-string": "^4.1.0",
+				"sort-keys": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/npm-run-path": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+			"integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"path-key": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/npmlog": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"deprecated": "This package is no longer supported.",
+			"dev": true,
+			"license": "ISC",
+			"optional": true,
+			"dependencies": {
+				"are-we-there-yet": "~1.1.2",
+				"console-control-strings": "~1.1.0",
+				"gauge": "~2.7.3",
+				"set-blocking": "~2.0.0"
+			}
+		},
+		"node_modules/nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
+		"node_modules/null-loader": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/null-loader/-/null-loader-3.0.0.tgz",
+			"integrity": "sha512-hf5sNLl8xdRho4UPBOOeoIwT3WhjYcMUQm0zj44EhD6UscMAz72o2udpoDFBgykucdEDGIcd6SXbc/G6zssbzw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^1.2.3",
+				"schema-utils": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.3.0"
+			}
+		},
+		"node_modules/null-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/null-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/null-loader/node_modules/schema-utils": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+			"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^6.1.0",
+				"ajv-errors": "^1.0.0",
+				"ajv-keywords": "^3.1.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/num2fraction": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+			"integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/number-is-nan": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+			"integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/nwsapi": {
+			"version": "2.2.12",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz",
+			"integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/oauth-sign": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-copy": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+			"integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+			"license": "MIT",
+			"dependencies": {
+				"copy-descriptor": "^0.1.0",
+				"define-property": "^0.2.5",
+				"kind-of": "^3.0.3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-copy/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"license": "MIT",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-copy/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"license": "MIT",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/object-copy/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"license": "MIT",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-hash": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
+			"integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10.0"
+			}
+		},
+		"node_modules/object-inspect": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+			"integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object-is": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
+			"integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object-keys": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/object-visit": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+			"integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+			"license": "MIT",
+			"dependencies": {
+				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object.assign": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+			"integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.5",
+				"define-properties": "^1.2.1",
+				"has-symbols": "^1.0.3",
+				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object.getownpropertydescriptors": {
+			"version": "2.1.8",
+			"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz",
+			"integrity": "sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"array.prototype.reduce": "^1.0.6",
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.2",
+				"es-object-atoms": "^1.0.0",
+				"gopd": "^1.0.1",
+				"safe-array-concat": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object.pick": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+			"integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+			"license": "MIT",
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object.values": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+			"integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/obuf": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/on-finished": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ee-first": "1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/on-headers": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+			"license": "ISC",
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/open": {
+			"version": "6.4.0",
+			"resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+			"integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-wsl": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/open/node_modules/is-wsl": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+			"integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/opener": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+			"dev": true,
+			"license": "(WTFPL OR MIT)",
+			"bin": {
+				"opener": "bin/opener-bin.js"
+			}
+		},
+		"node_modules/opn": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+			"integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-wsl": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/opn/node_modules/is-wsl": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+			"integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/optionator": {
+			"version": "0.8.3",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"deep-is": "~0.1.3",
+				"fast-levenshtein": "~2.0.6",
+				"levn": "~0.3.0",
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2",
+				"word-wrap": "~1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/ora": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
+			"integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^2.4.2",
+				"cli-cursor": "^2.1.0",
+				"cli-spinners": "^2.0.0",
+				"log-symbols": "^2.2.0",
+				"strip-ansi": "^5.2.0",
+				"wcwidth": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ora/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ora/node_modules/cli-cursor": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+			"integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"restore-cursor": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/ora/node_modules/log-symbols": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+			"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/ora/node_modules/mimic-fn": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+			"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/ora/node_modules/onetime": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+			"integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mimic-fn": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/ora/node_modules/restore-cursor": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+			"integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"onetime": "^2.0.0",
+				"signal-exit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/ora/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/os-browserify": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+			"integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
+			"license": "MIT"
+		},
+		"node_modules/os-homedir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+			"integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/os-locale": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+			"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"execa": "^1.0.0",
+				"lcid": "^2.0.0",
+				"mem": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/os-tmpdir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+			"integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ospath": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
+			"integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/p-defer": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+			"integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/p-finally": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+			"integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/p-is-promise": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+			"integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"license": "MIT",
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/p-map": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+			"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"aggregate-error": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-retry": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+			"integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"retry": "^0.12.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/package-json-from-dist": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+			"integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0"
+		},
+		"node_modules/pako": {
+			"version": "0.2.9",
+			"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+			"integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
+			"license": "MIT"
+		},
+		"node_modules/parallel-transform": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+			"integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+			"license": "MIT",
+			"dependencies": {
+				"cyclist": "^1.0.1",
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.1.5"
+			}
+		},
+		"node_modules/param-case": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+			"integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"no-case": "^2.2.0"
+			}
+		},
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parent-module/node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-asn1": {
+			"version": "5.1.7",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz",
+			"integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
+			"license": "ISC",
+			"dependencies": {
+				"asn1.js": "^4.10.1",
+				"browserify-aes": "^1.2.0",
+				"evp_bytestokey": "^1.0.3",
+				"hash-base": "~3.0",
+				"pbkdf2": "^3.1.2",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/parse-json": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+			"integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"error-ex": "^1.3.1",
+				"json-parse-better-errors": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/parse5": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+			"integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/parse5-htmlparser2-tree-adapter": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+			"integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"parse5": "^6.0.1"
+			}
+		},
+		"node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/parseurl": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/pascalcase": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+			"integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-browserify": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+			"integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+			"license": "MIT"
+		},
+		"node_modules/path-dirname": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+			"integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+			"devOptional": true,
+			"license": "MIT"
+		},
+		"node_modules/path-exists": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+			"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-is-inside": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+			"integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+			"dev": true,
+			"license": "(WTFPL OR MIT)"
+		},
+		"node_modules/path-key": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+			"integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"license": "MIT"
+		},
+		"node_modules/path-scurry": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+			"integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"lru-cache": "^10.2.0",
+				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/path-scurry/node_modules/lru-cache": {
+			"version": "10.4.3",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+			"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/path-scurry/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			}
+		},
+		"node_modules/path-to-regexp": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+			"integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+			"license": "MIT"
+		},
+		"node_modules/path-type": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+			"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/path-type/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pathval": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+			"integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/pbkdf2": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+			"license": "MIT",
+			"dependencies": {
+				"create-hash": "^1.1.2",
+				"create-hmac": "^1.1.4",
+				"ripemd160": "^2.0.1",
+				"safe-buffer": "^5.0.1",
+				"sha.js": "^2.4.8"
+			},
+			"engines": {
+				"node": ">=0.12"
+			}
+		},
+		"node_modules/pdfkit": {
+			"version": "0.12.3",
+			"resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.12.3.tgz",
+			"integrity": "sha512-+qDLgm2yq6WOKcxTb43lDeo3EtMIDQs0CK1RNqhHC9iT6u0KOmgwAClkYh9xFw2ATbmUZzt4f7KMwDCOfPDluA==",
+			"license": "MIT",
+			"dependencies": {
+				"crypto-js": "^4.0.0",
+				"fontkit": "^1.8.1",
+				"linebreak": "^1.0.2",
+				"png-js": "^1.0.0"
+			}
+		},
+		"node_modules/pdfmake": {
+			"version": "0.1.72",
+			"resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.1.72.tgz",
+			"integrity": "sha512-xZrPS+Safjf1I8ZYtMoXX83E6C6Pd1zFwa168yNTeeJWHclqf1z9DoYajjlY2uviN7gGyxwVZeou39uSk1oh1g==",
+			"license": "MIT",
+			"dependencies": {
+				"iconv-lite": "^0.6.2",
+				"linebreak": "^1.0.2",
+				"pdfkit": "^0.12.0",
+				"svg-to-pdfkit": "^0.1.8",
+				"xmldoc": "^1.1.2"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pdfmake/node_modules/iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"license": "MIT",
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/pend": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+			"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/performance-now": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+			"license": "MIT"
+		},
+		"node_modules/picocolors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+			"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+			"license": "ISC"
+		},
+		"node_modules/picomatch": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+			"devOptional": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/picomodal": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/picomodal/-/picomodal-3.0.0.tgz",
+			"integrity": "sha512-FoR3TDfuLlqUvcEeK5ifpKSVVns6B4BQvc8SDF6THVMuadya6LLtji0QgUDSStw0ZR2J7I6UGi5V2V23rnPWTw==",
+			"license": "MIT"
+		},
+		"node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/pinkie": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+			"integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/pinkie-promise": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+			"integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"pinkie": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-up": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+			"integrity": "sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"find-up": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pkg-up/node_modules/find-up": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+			"integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pkg-up/node_modules/locate-path": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+			"integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^2.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pkg-up/node_modules/p-limit": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+			"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-try": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pkg-up/node_modules/p-locate": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+			"integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pkg-up/node_modules/p-try": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+			"integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pluralize": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+			"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/pn": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+			"integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/png-js": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/png-js/-/png-js-1.0.0.tgz",
+			"integrity": "sha512-k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g=="
+		},
+		"node_modules/pnp-webpack-plugin": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz",
+			"integrity": "sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ts-pnp": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/polylabel": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/polylabel/-/polylabel-1.1.0.tgz",
+			"integrity": "sha512-bxaGcA40sL3d6M4hH72Z4NdLqxpXRsCFk8AITYg6x1rn1Ei3izf00UMLklerBZTO49aPA3CYrIwVulx2Bce2pA==",
+			"license": "ISC",
+			"dependencies": {
+				"tinyqueue": "^2.0.3"
+			}
+		},
+		"node_modules/portfinder": {
+			"version": "1.0.32",
+			"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+			"integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"async": "^2.6.4",
+				"debug": "^3.2.7",
+				"mkdirp": "^0.5.6"
+			},
+			"engines": {
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/portfinder/node_modules/async": {
+			"version": "2.6.4",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+			"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"lodash": "^4.17.14"
+			}
+		},
+		"node_modules/portfinder/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/posix-character-classes": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+			"integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/possible-typed-array-names": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+			"integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/postcss": {
+			"version": "7.0.39",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+			"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+			"license": "MIT",
+			"dependencies": {
+				"picocolors": "^0.2.1",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/postcss/"
+			}
+		},
+		"node_modules/postcss-calc": {
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+			"integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.27",
+				"postcss-selector-parser": "^6.0.2",
+				"postcss-value-parser": "^4.0.2"
+			}
+		},
+		"node_modules/postcss-colormin": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+			"integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"browserslist": "^4.0.0",
+				"color": "^3.0.0",
+				"has": "^1.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-colormin/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-convert-values": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+			"integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-discard-comments": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+			"integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-discard-duplicates": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+			"integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-discard-empty": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+			"integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-discard-overridden": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+			"integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-load-config": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+			"integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cosmiconfig": "^5.0.0",
+				"import-cwd": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/postcss/"
+			}
+		},
+		"node_modules/postcss-loader": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+			"integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^1.1.0",
+				"postcss": "^7.0.0",
+				"postcss-load-config": "^2.0.0",
+				"schema-utils": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/postcss-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/postcss-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/postcss-loader/node_modules/schema-utils": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+			"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^6.1.0",
+				"ajv-errors": "^1.0.0",
+				"ajv-keywords": "^3.1.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/postcss-merge-longhand": {
+			"version": "4.0.11",
+			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+			"integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"css-color-names": "0.0.4",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0",
+				"stylehacks": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-merge-rules": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+			"integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"browserslist": "^4.0.0",
+				"caniuse-api": "^3.0.0",
+				"cssnano-util-same-parent": "^4.0.0",
+				"postcss": "^7.0.0",
+				"postcss-selector-parser": "^3.0.0",
+				"vendors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+			"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"dot-prop": "^5.2.0",
+				"indexes-of": "^1.0.1",
+				"uniq": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/postcss-minify-font-values": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+			"integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-minify-gradients": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+			"integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssnano-util-get-arguments": "^4.0.0",
+				"is-color-stop": "^1.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-minify-params": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+			"integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"alphanum-sort": "^1.0.0",
+				"browserslist": "^4.0.0",
+				"cssnano-util-get-arguments": "^4.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0",
+				"uniqs": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-minify-selectors": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+			"integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"alphanum-sort": "^1.0.0",
+				"has": "^1.0.0",
+				"postcss": "^7.0.0",
+				"postcss-selector-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+			"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"dot-prop": "^5.2.0",
+				"indexes-of": "^1.0.1",
+				"uniq": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/postcss-modules-extract-imports": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+			"integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+			"license": "ISC",
+			"dependencies": {
+				"postcss": "^7.0.5"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/postcss-modules-local-by-default": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
+			"integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+			"license": "MIT",
+			"dependencies": {
+				"icss-utils": "^4.1.1",
+				"postcss": "^7.0.32",
+				"postcss-selector-parser": "^6.0.2",
+				"postcss-value-parser": "^4.1.0"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/postcss-modules-scope": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
+			"integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+			"license": "ISC",
+			"dependencies": {
+				"postcss": "^7.0.6",
+				"postcss-selector-parser": "^6.0.0"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/postcss-modules-values": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
+			"integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+			"license": "ISC",
+			"dependencies": {
+				"icss-utils": "^4.0.0",
+				"postcss": "^7.0.6"
+			}
+		},
+		"node_modules/postcss-normalize-charset": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+			"integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-display-values": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+			"integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssnano-util-get-match": "^4.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-normalize-positions": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+			"integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssnano-util-get-arguments": "^4.0.0",
+				"has": "^1.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-normalize-repeat-style": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+			"integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssnano-util-get-arguments": "^4.0.0",
+				"cssnano-util-get-match": "^4.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-normalize-string": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+			"integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has": "^1.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-normalize-timing-functions": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+			"integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssnano-util-get-match": "^4.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-normalize-unicode": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+			"integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"browserslist": "^4.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-normalize-url": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+			"integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-absolute-url": "^2.0.0",
+				"normalize-url": "^3.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-url/node_modules/normalize-url": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+			"integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-normalize-whitespace": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+			"integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-ordered-values": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+			"integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssnano-util-get-arguments": "^4.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-reduce-initial": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+			"integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"browserslist": "^4.0.0",
+				"caniuse-api": "^3.0.0",
+				"has": "^1.0.0",
+				"postcss": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-reduce-transforms": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+			"integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssnano-util-get-match": "^4.0.0",
+				"has": "^1.0.0",
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-selector-parser": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+			"integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+			"license": "MIT",
+			"dependencies": {
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/postcss-svgo": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
+			"integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss": "^7.0.0",
+				"postcss-value-parser": "^3.0.0",
+				"svgo": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/postcss-unique-selectors": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+			"integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"alphanum-sort": "^1.0.0",
+				"postcss": "^7.0.0",
+				"uniqs": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+			"license": "MIT"
+		},
+		"node_modules/postcss/node_modules/picocolors": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+			"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+			"license": "ISC"
+		},
+		"node_modules/prebuild-install": {
+			"version": "5.3.4",
+			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.4.tgz",
+			"integrity": "sha512-AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"detect-libc": "^1.0.3",
+				"expand-template": "^2.0.3",
+				"github-from-package": "0.0.0",
+				"minimist": "^1.2.3",
+				"mkdirp": "^0.5.1",
+				"napi-build-utils": "^1.0.1",
+				"node-abi": "^2.7.0",
+				"noop-logger": "^0.1.1",
+				"npmlog": "^4.0.1",
+				"pump": "^3.0.0",
+				"rc": "^1.2.7",
+				"simple-get": "^3.0.3",
+				"tar-fs": "^2.0.0",
+				"tunnel-agent": "^0.6.0",
+				"which-pm-runs": "^1.0.0"
+			},
+			"bin": {
+				"prebuild-install": "bin.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+			"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/prepend-http": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+			"integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/prettier": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
+			"integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
+			"devOptional": true,
+			"license": "MIT",
+			"bin": {
+				"prettier": "bin-prettier.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/pretty": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
+			"integrity": "sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"condense-newlines": "^0.2.1",
+				"extend-shallow": "^2.0.1",
+				"js-beautify": "^1.6.12"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/pretty-bytes": {
+			"version": "5.6.0",
+			"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+			"integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pretty-error": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
+			"integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"lodash": "^4.17.20",
+				"renderkid": "^2.0.4"
+			}
+		},
+		"node_modules/pretty/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/pretty/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/printj": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
+			"integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==",
+			"license": "Apache-2.0",
+			"bin": {
+				"printj": "bin/printj.njs"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/process": {
+			"version": "0.11.10",
+			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+			"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6.0"
+			}
+		},
+		"node_modules/process-nextick-args": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+			"license": "MIT"
+		},
+		"node_modules/progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/promise-inflight": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+			"integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+			"license": "ISC"
+		},
+		"node_modules/proto-list": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+			"integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/proxy-addr": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"forwarded": "0.2.0",
+				"ipaddr.js": "1.9.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/proxy-from-env": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+			"integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/prr": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+			"integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+			"license": "MIT"
+		},
+		"node_modules/pseudomap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+			"integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+			"license": "ISC"
+		},
+		"node_modules/psl": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+			"integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/public-encrypt": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+			"license": "MIT",
+			"dependencies": {
+				"bn.js": "^4.1.0",
+				"browserify-rsa": "^4.0.0",
+				"create-hash": "^1.1.0",
+				"parse-asn1": "^5.0.0",
+				"randombytes": "^2.0.1",
+				"safe-buffer": "^5.1.2"
+			}
+		},
+		"node_modules/public-encrypt/node_modules/bn.js": {
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"license": "MIT"
+		},
+		"node_modules/pump": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+			"license": "MIT",
+			"dependencies": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"node_modules/pumpify": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+			"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+			"license": "MIT",
+			"dependencies": {
+				"duplexify": "^3.6.0",
+				"inherits": "^2.0.3",
+				"pump": "^2.0.0"
+			}
+		},
+		"node_modules/pumpify/node_modules/pump": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+			"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+			"license": "MIT",
+			"dependencies": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"node_modules/punycode": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/q": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+			"integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+			"deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.6.0",
+				"teleport": ">=0.2.0"
+			}
+		},
+		"node_modules/qs": {
+			"version": "6.13.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"side-channel": "^1.0.6"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/query-string": {
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+			"integrity": "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"object-assign": "^4.1.0",
+				"strict-uri-encode": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/querystring": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+			"integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+			"deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.x"
+			}
+		},
+		"node_modules/querystring-es3": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+			"integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+			"engines": {
+				"node": ">=0.4.x"
+			}
+		},
+		"node_modules/querystringify": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+			"license": "MIT"
+		},
+		"node_modules/raf": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+			"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+			"license": "MIT",
+			"dependencies": {
+				"performance-now": "^2.1.0"
+			}
+		},
+		"node_modules/ramda": {
+			"version": "0.24.1",
+			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz",
+			"integrity": "sha512-HEm619G8PaZMfkqCa23qiOe7r3R0brPu7ZgOsgKUsnvLhd0qhc/vTjkUovomgPWa5ECBa08fJZixth9LaoBo5w==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"license": "MIT",
+			"dependencies": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"node_modules/randomfill": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+			"license": "MIT",
+			"dependencies": {
+				"randombytes": "^2.0.5",
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"node_modules/range-parser": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/raw-body": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+			"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"bytes": "3.1.2",
+				"http-errors": "2.0.0",
+				"iconv-lite": "0.4.24",
+				"unpipe": "1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/rc": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+			"dev": true,
+			"license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+			"optional": true,
+			"dependencies": {
+				"deep-extend": "^0.6.0",
+				"ini": "~1.3.0",
+				"minimist": "^1.2.0",
+				"strip-json-comments": "~2.0.1"
+			},
+			"bin": {
+				"rc": "cli.js"
+			}
+		},
+		"node_modules/rc/node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true,
+			"license": "ISC",
+			"optional": true
+		},
+		"node_modules/read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg/node_modules/parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"license": "MIT",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/readable-stream/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"license": "MIT"
+		},
+		"node_modules/readable-stream/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"license": "MIT"
+		},
+		"node_modules/readdirp": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+			"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+			"devOptional": true,
+			"license": "MIT",
+			"dependencies": {
+				"graceful-fs": "^4.1.11",
+				"micromatch": "^3.1.10",
+				"readable-stream": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/rechoir": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+			"integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+			"dev": true,
+			"dependencies": {
+				"resolve": "^1.1.6"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/regenerate": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/regenerate-unicode-properties": {
+			"version": "10.2.0",
+			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+			"integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"regenerate": "^1.4.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/regenerator-runtime": {
+			"version": "0.14.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+			"license": "MIT"
+		},
+		"node_modules/regenerator-transform": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+			"integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/runtime": "^7.8.4"
+			}
+		},
+		"node_modules/regex-not": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+			"license": "MIT",
+			"dependencies": {
+				"extend-shallow": "^3.0.2",
+				"safe-regex": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/regexp.prototype.flags": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+			"integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.6",
+				"define-properties": "^1.2.1",
+				"es-errors": "^1.3.0",
+				"set-function-name": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/regexpp": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+			"integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.5.0"
+			}
+		},
+		"node_modules/regexpu-core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/regjsgen": "^0.8.0",
+				"regenerate": "^1.4.2",
+				"regenerate-unicode-properties": "^10.1.0",
+				"regjsparser": "^0.9.1",
+				"unicode-match-property-ecmascript": "^2.0.0",
+				"unicode-match-property-value-ecmascript": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/regjsparser": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"jsesc": "~0.5.0"
+			},
+			"bin": {
+				"regjsparser": "bin/parser"
+			}
+		},
+		"node_modules/regjsparser/node_modules/jsesc": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+			"dev": true,
+			"bin": {
+				"jsesc": "bin/jsesc"
+			}
+		},
+		"node_modules/regression": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/regression/-/regression-2.0.1.tgz",
+			"integrity": "sha512-A4XYsc37dsBaNOgEjkJKzfJlE394IMmUPlI/p3TTI9u3T+2a+eox5Pr/CPUqF0eszeWZJPAc6QkroAhuUpWDJQ==",
+			"license": "MIT"
+		},
+		"node_modules/relateurl": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+			"integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/remove-trailing-separator": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+			"integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+			"devOptional": true,
+			"license": "ISC"
+		},
+		"node_modules/renderkid": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz",
+			"integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"css-select": "^4.1.3",
+				"dom-converter": "^0.2.0",
+				"htmlparser2": "^6.1.0",
+				"lodash": "^4.17.21",
+				"strip-ansi": "^3.0.1"
+			}
+		},
+		"node_modules/renderkid/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/renderkid/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/repeat-element": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+			"integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/repeat-string": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+			"integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/repeating": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+			"integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-finite": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/request": {
+			"version": "2.88.2",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+			"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~2.3.2",
+				"har-validator": "~5.1.3",
+				"http-signature": "~1.2.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"oauth-sign": "~0.9.0",
+				"performance-now": "^2.1.0",
+				"qs": "~6.5.2",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "~2.5.0",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^3.3.2"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/request-progress": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
+			"integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"throttleit": "^1.0.0"
+			}
+		},
+		"node_modules/request-promise-core": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+			"integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"lodash": "^4.17.19"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			},
+			"peerDependencies": {
+				"request": "^2.34"
+			}
+		},
+		"node_modules/request-promise-native": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+			"integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+			"deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"request-promise-core": "1.1.4",
+				"stealthy-require": "^1.1.1",
+				"tough-cookie": "^2.3.3"
+			},
+			"engines": {
+				"node": ">=0.12.0"
+			},
+			"peerDependencies": {
+				"request": "^2.34"
+			}
+		},
+		"node_modules/request-promise-native/node_modules/tough-cookie": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"psl": "^1.1.28",
+				"punycode": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/request/node_modules/form-data": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.6",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 0.12"
+			}
+		},
+		"node_modules/request/node_modules/http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			},
+			"engines": {
+				"node": ">=0.8",
+				"npm": ">=1.3.7"
+			}
+		},
+		"node_modules/request/node_modules/jsprim": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+			"integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.4.0",
+				"verror": "1.10.0"
+			},
+			"engines": {
+				"node": ">=0.6.0"
+			}
+		},
+		"node_modules/request/node_modules/qs": {
+			"version": "6.5.3",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+			"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/request/node_modules/tough-cookie": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"psl": "^1.1.28",
+				"punycode": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/request/node_modules/uuid": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+			"deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"uuid": "bin/uuid"
+			}
+		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/require-main-filename": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+			"integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/require-uncached": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+			"integrity": "sha512-Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"caller-path": "^0.1.0",
+				"resolve-from": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/require-uncached/node_modules/caller-path": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+			"integrity": "sha512-UJiE1otjXPF5/x+T3zTnSFiTOEmJoGTD9HmBoxnCUwho61a2eSNn/VwtwuIBDAo2SEOv1AJ7ARI5gCmohFLu/g==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"callsites": "^0.2.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/require-uncached/node_modules/callsites": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+			"integrity": "sha512-Zv4Dns9IbXXmPkgRRUjAaJQgfN4xX5p6+RQFhWUqscdvvK2xK/ZL8b3IXIJsj+4sD+f24NwnWy2BY8AJ82JB0A==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/require-uncached/node_modules/resolve-from": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+			"integrity": "sha512-kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/requires-port": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+			"license": "MIT"
+		},
+		"node_modules/reselect": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
+			"integrity": "sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/resolve": {
+			"version": "1.22.8",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+			"license": "MIT",
+			"dependencies": {
+				"is-core-module": "^2.13.0",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/resolve-cwd": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+			"integrity": "sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"resolve-from": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+			"integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/resolve-url": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+			"integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+			"deprecated": "https://github.com/lydell/resolve-url#deprecated",
+			"license": "MIT"
+		},
+		"node_modules/restore-cursor": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+			"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"onetime": "^5.1.0",
+				"signal-exit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/restructure": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/restructure/-/restructure-2.0.1.tgz",
+			"integrity": "sha512-e0dOpjm5DseomnXx2M5lpdZ5zoHqF1+bqdMJUohoYVVQa7cBdnk7fdmeI6byNWP/kiME72EeTiSypTCVnpLiDg==",
+			"license": "MIT"
+		},
+		"node_modules/ret": {
+			"version": "0.1.15",
+			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.12"
+			}
+		},
+		"node_modules/retry": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+			"integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/rfdc": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+			"integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/rgb-regex": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+			"integrity": "sha512-gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/rgba-regex": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+			"integrity": "sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/rgbcolor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
+			"integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==",
+			"license": "MIT OR SEE LICENSE IN FEEL-FREE.md",
+			"engines": {
+				"node": ">= 0.8.15"
+			}
+		},
+		"node_modules/rimraf": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
+			"license": "ISC",
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			}
+		},
+		"node_modules/ripemd160": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+			"license": "MIT",
+			"dependencies": {
+				"hash-base": "^3.0.0",
+				"inherits": "^2.0.1"
+			}
+		},
+		"node_modules/roboto-fontface": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz",
+			"integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==",
+			"license": "Apache-2.0"
+		},
+		"node_modules/run-async": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+			"integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/run-queue": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+			"integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==",
+			"license": "ISC",
+			"dependencies": {
+				"aproba": "^1.1.1"
+			}
+		},
+		"node_modules/rx-lite": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+			"integrity": "sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/rx-lite-aggregates": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+			"integrity": "sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"rx-lite": "*"
+			}
+		},
+		"node_modules/rxjs": {
+			"version": "6.6.7",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+			"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"tslib": "^1.9.0"
+			},
+			"engines": {
+				"npm": ">=2.0.0"
+			}
+		},
+		"node_modules/safe-array-concat": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+			"integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"get-intrinsic": "^1.2.4",
+				"has-symbols": "^1.0.3",
+				"isarray": "^2.0.5"
+			},
+			"engines": {
+				"node": ">=0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"license": "MIT"
+		},
+		"node_modules/safe-regex": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+			"integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+			"license": "MIT",
+			"dependencies": {
+				"ret": "~0.1.10"
+			}
+		},
+		"node_modules/safe-regex-test": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+			"integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.6",
+				"es-errors": "^1.3.0",
+				"is-regex": "^1.1.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"license": "MIT"
+		},
+		"node_modules/sass": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.19.0.tgz",
+			"integrity": "sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chokidar": "^2.0.0"
+			},
+			"bin": {
+				"sass": "sass.js"
+			},
+			"engines": {
+				"node": ">=0.11.8"
+			}
+		},
+		"node_modules/sass-loader": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz",
+			"integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"clone-deep": "^4.0.1",
+				"loader-utils": "^1.2.3",
+				"neo-async": "^2.6.1",
+				"schema-utils": "^2.1.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"peerDependencies": {
+				"fibers": ">= 3.1.0",
+				"node-sass": "^4.0.0",
+				"sass": "^1.3.0",
+				"webpack": "^4.36.0"
+			},
+			"peerDependenciesMeta": {
+				"fibers": {
+					"optional": true
+				},
+				"node-sass": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/sass-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/sass-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/sax": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+			"license": "ISC"
+		},
+		"node_modules/saxes": {
+			"version": "3.1.11",
+			"resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
+			"integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"xmlchars": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/schema-utils": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.5",
+				"ajv": "^6.12.4",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/schema-utils/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/select-hose": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/selfsigned": {
+			"version": "1.10.14",
+			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz",
+			"integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"node-forge": "^0.10.0"
+			}
+		},
+		"node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/send": {
+			"version": "0.19.0",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+			"integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"destroy": "1.2.0",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"fresh": "0.5.2",
+				"http-errors": "2.0.0",
+				"mime": "1.6.0",
+				"ms": "2.1.3",
+				"on-finished": "2.4.1",
+				"range-parser": "~1.2.1",
+				"statuses": "2.0.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/send/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/send/node_modules/debug/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/send/node_modules/encodeurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/send/node_modules/mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/serialize-javascript": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+			"integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"randombytes": "^2.1.0"
+			}
+		},
+		"node_modules/serve-index": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"accepts": "~1.3.4",
+				"batch": "0.6.1",
+				"debug": "2.6.9",
+				"escape-html": "~1.0.3",
+				"http-errors": "~1.6.2",
+				"mime-types": "~2.1.17",
+				"parseurl": "~1.3.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/depd": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/inherits": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/serve-index/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/serve-index/node_modules/setprototypeof": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/serve-index/node_modules/statuses": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+			"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-static": {
+			"version": "1.16.2",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+			"integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"encodeurl": "~2.0.0",
+				"escape-html": "~1.0.3",
+				"parseurl": "~1.3.3",
+				"send": "0.19.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/set-blocking": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/set-function-length": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+			"license": "MIT",
+			"dependencies": {
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/set-function-name": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+			"integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+			"license": "MIT",
+			"dependencies": {
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"functions-have-names": "^1.2.3",
+				"has-property-descriptors": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/set-value": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+			"license": "MIT",
+			"dependencies": {
+				"extend-shallow": "^2.0.1",
+				"is-extendable": "^0.1.1",
+				"is-plain-object": "^2.0.3",
+				"split-string": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/set-value/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"license": "MIT",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/set-value/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/setimmediate": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+			"license": "MIT"
+		},
+		"node_modules/setprototypeof": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/sha.js": {
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+			"license": "(MIT AND BSD-3-Clause)",
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			},
+			"bin": {
+				"sha.js": "bin.js"
+			}
+		},
+		"node_modules/shallow-clone": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-command": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+			"integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"shebang-regex": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+			"integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/shell-quote": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+			"integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/shelljs": {
+			"version": "0.8.5",
+			"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+			"integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"glob": "^7.0.0",
+				"interpret": "^1.0.0",
+				"rechoir": "^0.6.2"
+			},
+			"bin": {
+				"shjs": "bin/shjs"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/side-channel": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+			"integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.4",
+				"object-inspect": "^1.13.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/signal-exit": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/simple-concat": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+			"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/simple-get": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+			"integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"decompress-response": "^4.2.0",
+				"once": "^1.3.1",
+				"simple-concat": "^1.0.0"
+			}
+		},
+		"node_modules/simple-swizzle": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+			"integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-arrayish": "^0.3.1"
+			}
+		},
+		"node_modules/simple-swizzle/node_modules/is-arrayish": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+			"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/sinon": {
+			"version": "11.1.1",
+			"resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.1.tgz",
+			"integrity": "sha512-ZSSmlkSyhUWbkF01Z9tEbxZLF/5tRC9eojCdFh33gtQaP7ITQVaMWQHGuFM7Cuf/KEfihuh1tTl3/ABju3AQMg==",
+			"deprecated": "16.1.1",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@sinonjs/commons": "^1.8.3",
+				"@sinonjs/fake-timers": "^7.1.0",
+				"@sinonjs/samsam": "^6.0.2",
+				"diff": "^5.0.0",
+				"nise": "^5.1.0",
+				"supports-color": "^7.2.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/sinon"
+			}
+		},
+		"node_modules/sinon/node_modules/diff": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+			"integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.3.1"
+			}
+		},
+		"node_modules/sinon/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/sinon/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/slash": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+			"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/slice-ansi": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+			"integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/snapdragon": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"license": "MIT",
+			"dependencies": {
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+			"license": "MIT",
+			"dependencies": {
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.0",
+				"snapdragon-util": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"license": "MIT",
+			"dependencies": {
+				"is-descriptor": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-util": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+			"license": "MIT",
+			"dependencies": {
+				"kind-of": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-util/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"license": "MIT",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"license": "MIT",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"license": "MIT",
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"license": "MIT",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/snapdragon/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
+		},
+		"node_modules/snapdragon/node_modules/source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/sockjs": {
+			"version": "0.3.24",
+			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"faye-websocket": "^0.11.3",
+				"uuid": "^8.3.2",
+				"websocket-driver": "^0.7.4"
+			}
+		},
+		"node_modules/sockjs-client": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz",
+			"integrity": "sha512-qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ==",
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^3.2.7",
+				"eventsource": "^1.1.0",
+				"faye-websocket": "^0.11.4",
+				"inherits": "^2.0.4",
+				"url-parse": "^1.5.10"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://tidelift.com/funding/github/npm/sockjs-client"
+			}
+		},
+		"node_modules/sockjs-client/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/sort-keys": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+			"integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-plain-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/sortablejs": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+			"integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==",
+			"license": "MIT"
+		},
+		"node_modules/source-list-map": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+			"integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+			"license": "MIT"
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-resolve": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+			"deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+			"license": "MIT",
+			"dependencies": {
+				"atob": "^2.1.2",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
+			}
+		},
+		"node_modules/source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"license": "MIT",
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/source-map-url": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+			"integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+			"deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+			"license": "MIT"
+		},
+		"node_modules/spdx-correct": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+			"integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-exceptions": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+			"integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+			"dev": true,
+			"license": "CC-BY-3.0"
+		},
+		"node_modules/spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-license-ids": {
+			"version": "3.0.20",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+			"integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
+			"dev": true,
+			"license": "CC0-1.0"
+		},
+		"node_modules/spdy": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^4.1.0",
+				"handle-thing": "^2.0.0",
+				"http-deceiver": "^1.2.7",
+				"select-hose": "^2.0.0",
+				"spdy-transport": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/spdy-transport": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^4.1.0",
+				"detect-node": "^2.0.4",
+				"hpack.js": "^2.1.6",
+				"obuf": "^1.1.2",
+				"readable-stream": "^3.0.6",
+				"wbuf": "^1.7.3"
+			}
+		},
+		"node_modules/spdy-transport/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/split-string": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+			"license": "MIT",
+			"dependencies": {
+				"extend-shallow": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+			"dev": true,
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/ssf": {
+			"version": "0.10.3",
+			"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz",
+			"integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"frac": "~1.1.2"
+			},
+			"bin": {
+				"ssf": "bin/ssf.njs"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/sshpk": {
+			"version": "1.18.0",
+			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+			"integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"asn1": "~0.2.3",
+				"assert-plus": "^1.0.0",
+				"bcrypt-pbkdf": "^1.0.0",
+				"dashdash": "^1.12.0",
+				"ecc-jsbn": "~0.1.1",
+				"getpass": "^0.1.1",
+				"jsbn": "~0.1.0",
+				"safer-buffer": "^2.0.2",
+				"tweetnacl": "~0.14.0"
+			},
+			"bin": {
+				"sshpk-conv": "bin/sshpk-conv",
+				"sshpk-sign": "bin/sshpk-sign",
+				"sshpk-verify": "bin/sshpk-verify"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ssri": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.1.tgz",
+			"integrity": "sha512-w+daCzXN89PseTL99MkA+fxJEcU3wfaE/ah0i0lnOlpG1CYLJ2ZjzEry68YBKfLs4JfoTShrTEsJkAZuNZ/stw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"figgy-pudding": "^3.5.1",
+				"minipass": "^3.1.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/stable": {
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+			"deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/stackblur-canvas": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
+			"integrity": "sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.1.14"
+			}
+		},
+		"node_modules/stackframe": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+			"integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/static-extend": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+			"integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+			"license": "MIT",
+			"dependencies": {
+				"define-property": "^0.2.5",
+				"object-copy": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/static-extend/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"license": "MIT",
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/static-extend/node_modules/is-descriptor": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"license": "MIT",
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/statuses": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/stealthy-require": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+			"integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/stop-iteration-iterator": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+			"integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+			"license": "MIT",
+			"dependencies": {
+				"internal-slot": "^1.0.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/stream-browserify": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+			"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "~2.0.1",
+				"readable-stream": "^2.0.2"
+			}
+		},
+		"node_modules/stream-each": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+			"integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+			"license": "MIT",
+			"dependencies": {
+				"end-of-stream": "^1.1.0",
+				"stream-shift": "^1.0.0"
+			}
+		},
+		"node_modules/stream-http": {
+			"version": "2.8.3",
+			"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+			"integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+			"license": "MIT",
+			"dependencies": {
+				"builtin-status-codes": "^3.0.0",
+				"inherits": "^2.0.1",
+				"readable-stream": "^2.3.6",
+				"to-arraybuffer": "^1.0.0",
+				"xtend": "^4.0.0"
+			}
+		},
+		"node_modules/stream-shift": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
+			"integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
+			"license": "MIT"
+		},
+		"node_modules/stream-to-observable": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.1.0.tgz",
+			"integrity": "sha512-h3mR71JoHxXrKApehgQk1CFbdi2nW9BAVqjPhpPD127H8iz0N61YsCLhJutm+JV0ajNAwPef0kMQsF0Jaz/A6Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/strict-uri-encode": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+			"integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"license": "MIT",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
+		"node_modules/string_decoder/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"license": "MIT"
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/string-width-cjs": {
+			"name": "string-width",
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/string.prototype.padstart": {
+			"version": "3.1.6",
+			"resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.6.tgz",
+			"integrity": "sha512-1y15lz7otgfRTAVK5qbp3eHIga+w8j7+jIH+7HpUrOfnLVl6n0hbspi4EXf4tR+PNOpBjPstltemkx0SvViOCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.0",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/string.prototype.trim": {
+			"version": "1.2.9",
+			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+			"integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.0",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/string.prototype.trimend": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+			"integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-object-atoms": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/string.prototype.trimstart": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+			"integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi-cjs": {
+			"name": "strip-ansi",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-eof": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+			"integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/strip-indent": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+			"integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/stylehacks": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+			"integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"browserslist": "^4.0.0",
+				"postcss": "^7.0.0",
+				"postcss-selector-parser": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/stylehacks/node_modules/postcss-selector-parser": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+			"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"dot-prop": "^5.2.0",
+				"indexes-of": "^1.0.1",
+				"uniq": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/svg-pathdata": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
+			"integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=12.0.0"
+			}
+		},
+		"node_modules/svg-tags": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+			"dev": true
+		},
+		"node_modules/svg-to-pdfkit": {
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/svg-to-pdfkit/-/svg-to-pdfkit-0.1.8.tgz",
+			"integrity": "sha512-QItiGZBy5TstGy+q8mjQTMGRlDDOARXLxH+sgVm1n/LYeo0zFcQlcCh8m4zi8QxctrxB9Kue/lStc/RD5iLadQ==",
+			"license": "MIT",
+			"dependencies": {
+				"pdfkit": ">=0.8.1"
+			}
+		},
+		"node_modules/svg.js": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/svg.js/-/svg.js-2.7.1.tgz",
+			"integrity": "sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA==",
+			"license": "MIT"
+		},
+		"node_modules/svgo": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+			"integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+			"deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^2.4.1",
+				"coa": "^2.0.2",
+				"css-select": "^2.0.0",
+				"css-select-base-adapter": "^0.1.1",
+				"css-tree": "1.0.0-alpha.37",
+				"csso": "^4.0.2",
+				"js-yaml": "^3.13.1",
+				"mkdirp": "~0.5.1",
+				"object.values": "^1.1.0",
+				"sax": "~1.2.4",
+				"stable": "^0.1.8",
+				"unquote": "~1.1.1",
+				"util.promisify": "~1.0.0"
+			},
+			"bin": {
+				"svgo": "bin/svgo"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/svgo/node_modules/css-select": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+			"integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^3.2.1",
+				"domutils": "^1.7.0",
+				"nth-check": "^1.0.2"
+			}
+		},
+		"node_modules/svgo/node_modules/css-what": {
+			"version": "3.4.2",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+			"integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/svgo/node_modules/dom-serializer": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+			"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"entities": "^2.0.0"
+			}
+		},
+		"node_modules/svgo/node_modules/domutils": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+			"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"dom-serializer": "0",
+				"domelementtype": "1"
+			}
+		},
+		"node_modules/svgo/node_modules/domutils/node_modules/domelementtype": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+			"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+			"dev": true,
+			"license": "BSD-2-Clause"
+		},
+		"node_modules/svgo/node_modules/nth-check": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+			"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"boolbase": "~1.0.0"
+			}
+		},
+		"node_modules/symbol-observable": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+			"integrity": "sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/symbol-tree": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/table": {
+			"version": "5.4.6",
+			"resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+			"integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"ajv": "^6.10.2",
+				"lodash": "^4.17.14",
+				"slice-ansi": "^2.1.0",
+				"string-width": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/table/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/table/node_modules/astral-regex": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+			"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/table/node_modules/emoji-regex": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/table/node_modules/is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/table/node_modules/slice-ansi": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+			"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^3.2.0",
+				"astral-regex": "^1.0.0",
+				"is-fullwidth-code-point": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/table/node_modules/string-width": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+			"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^7.0.1",
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/table/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tapable": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+			"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tar-fs": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"chownr": "^1.1.1",
+				"mkdirp-classic": "^0.5.2",
+				"pump": "^3.0.0",
+				"tar-stream": "^2.1.4"
+			}
+		},
+		"node_modules/tar-stream": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"bl": "^4.0.3",
+				"end-of-stream": "^1.4.1",
+				"fs-constants": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^3.1.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tar-stream/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/terser": {
+			"version": "4.8.1",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+			"integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"commander": "^2.20.0",
+				"source-map": "~0.6.1",
+				"source-map-support": "~0.5.12"
+			},
+			"bin": {
+				"terser": "bin/terser"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/terser-webpack-plugin": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
+			"integrity": "sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cacache": "^13.0.1",
+				"find-cache-dir": "^3.3.1",
+				"jest-worker": "^25.4.0",
+				"p-limit": "^2.3.0",
+				"schema-utils": "^2.6.6",
+				"serialize-javascript": "^4.0.0",
+				"source-map": "^0.6.1",
+				"terser": "^4.6.12",
+				"webpack-sources": "^1.4.3"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/cacache": {
+			"version": "13.0.1",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
+			"integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"chownr": "^1.1.2",
+				"figgy-pudding": "^3.5.1",
+				"fs-minipass": "^2.0.0",
+				"glob": "^7.1.4",
+				"graceful-fs": "^4.2.2",
+				"infer-owner": "^1.0.4",
+				"lru-cache": "^5.1.1",
+				"minipass": "^3.0.0",
+				"minipass-collect": "^1.0.2",
+				"minipass-flush": "^1.0.5",
+				"minipass-pipeline": "^1.2.2",
+				"mkdirp": "^0.5.1",
+				"move-concurrently": "^1.0.1",
+				"p-map": "^3.0.0",
+				"promise-inflight": "^1.0.1",
+				"rimraf": "^2.7.1",
+				"ssri": "^7.0.0",
+				"unique-filename": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/p-map": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+			"integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"aggregate-error": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/terser/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"license": "MIT"
+		},
+		"node_modules/text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/thenify": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+			"integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"any-promise": "^1.0.0"
+			}
+		},
+		"node_modules/thenify-all": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+			"integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"thenify": ">= 3.1.0 < 4"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/thread-loader": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz",
+			"integrity": "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-runner": "^2.3.1",
+				"loader-utils": "^1.1.0",
+				"neo-async": "^2.6.0"
+			},
+			"engines": {
+				"node": ">= 6.9.0 <7.0.0 || >= 8.9.0"
+			},
+			"peerDependencies": {
+				"webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
+			}
+		},
+		"node_modules/thread-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/thread-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/throttleit": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.1.tgz",
+			"integrity": "sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+			"license": "MIT",
+			"dependencies": {
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
+			}
+		},
+		"node_modules/thunky": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/timers-browserify": {
+			"version": "2.0.12",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+			"license": "MIT",
+			"dependencies": {
+				"setimmediate": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6.0"
+			}
+		},
+		"node_modules/timsort": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+			"integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/tiny-cookie": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tiny-cookie/-/tiny-cookie-1.0.1.tgz",
+			"integrity": "sha512-4KJ21HYTNumxnHvCbLrtrrhSwtWXzpmaRJIUg4biBii5AiSe2izod5bauXiiQxVuf2Fta57U2DTW1Fa4/6Cmgw=="
+		},
+		"node_modules/tiny-inflate": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
+			"integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
+			"license": "MIT"
+		},
+		"node_modules/tinyqueue": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
+			"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==",
+			"license": "ISC"
+		},
+		"node_modules/tmp": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+			"integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=14.14"
+			}
+		},
+		"node_modules/to-arraybuffer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+			"integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
+			"license": "MIT"
+		},
+		"node_modules/to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/to-object-path": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+			"integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+			"license": "MIT",
+			"dependencies": {
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/to-object-path/node_modules/kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"license": "MIT",
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/to-regex": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+			"license": "MIT",
+			"dependencies": {
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/to-regex-range": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+			"integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+			"license": "MIT",
+			"dependencies": {
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/toidentifier": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/toposort": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+			"integrity": "sha512-FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/tough-cookie": {
+			"version": "4.1.4",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+			"integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"psl": "^1.1.33",
+				"punycode": "^2.1.1",
+				"universalify": "^0.2.0",
+				"url-parse": "^1.5.3"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tough-cookie/node_modules/universalify": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
+		"node_modules/tr46": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+			"integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/tryer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/ts-pnp": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
+			"integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"license": "0BSD"
+		},
+		"node_modules/tty-browserify": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+			"integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
+			"license": "MIT"
+		},
+		"node_modules/tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"safe-buffer": "^5.0.1"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/tweetnacl": {
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+			"dev": true,
+			"license": "Unlicense"
+		},
+		"node_modules/type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"prelude-ls": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/type-detect": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+			"integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/type-is": {
+			"version": "1.6.18",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"media-typer": "0.3.0",
+				"mime-types": "~2.1.24"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/typed-array-buffer": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+			"integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"is-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/typed-array-byte-length": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+			"integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-proto": "^1.0.3",
+				"is-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/typed-array-byte-offset": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+			"integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"available-typed-arrays": "^1.0.7",
+				"call-bind": "^1.0.7",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-proto": "^1.0.3",
+				"is-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/typed-array-length": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+			"integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-proto": "^1.0.3",
+				"is-typed-array": "^1.1.13",
+				"possible-typed-array-names": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/typedarray": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+			"license": "MIT"
+		},
+		"node_modules/uglify-js": {
+			"version": "3.4.10",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+			"integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"commander": "~2.19.0",
+				"source-map": "~0.6.1"
+			},
+			"bin": {
+				"uglifyjs": "bin/uglifyjs"
+			},
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/uglify-js/node_modules/commander": {
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+			"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/uiv": {
+			"version": "0.27.0",
+			"resolved": "https://registry.npmjs.org/uiv/-/uiv-0.27.0.tgz",
+			"integrity": "sha512-4kO9oGekQ/sXVTz7KdxnOwXcTfWGnwZzbstSWQEP9PokfHQ0W0dwbiXW93t6qSB/hVVSRifF7Tvv2pLLVevftA==",
+			"license": "MIT",
+			"dependencies": {
+				"vue-functional-data-merge": "^2.0.3"
+			},
+			"engines": {
+				"node": ">= 4.0.0",
+				"npm": ">= 3.0.0"
+			}
+		},
+		"node_modules/unbox-primitive": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+			"integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-bigints": "^1.0.2",
+				"has-symbols": "^1.0.3",
+				"which-boxed-primitive": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/underscore": {
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+			"integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+			"license": "MIT"
+		},
+		"node_modules/undici-types": {
+			"version": "6.19.8",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+			"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/unicode-canonical-property-names-ecmascript": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+			"integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-match-property-ecmascript": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"unicode-canonical-property-names-ecmascript": "^2.0.0",
+				"unicode-property-aliases-ecmascript": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-match-property-value-ecmascript": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+			"integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-properties": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
+			"integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
+			"license": "MIT",
+			"dependencies": {
+				"base64-js": "^1.3.0",
+				"unicode-trie": "^2.0.0"
+			}
+		},
+		"node_modules/unicode-property-aliases-ecmascript": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-trie": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
+			"integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
+			"license": "MIT",
+			"dependencies": {
+				"pako": "^0.2.5",
+				"tiny-inflate": "^1.0.0"
+			}
+		},
+		"node_modules/union-value": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+			"license": "MIT",
+			"dependencies": {
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/union-value/node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/uniq": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+			"integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/uniqs": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+			"integrity": "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/unique-filename": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+			"license": "ISC",
+			"dependencies": {
+				"unique-slug": "^2.0.0"
+			}
+		},
+		"node_modules/unique-slug": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+			"integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4"
+			}
+		},
+		"node_modules/universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
+		"node_modules/unpipe": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/unquote": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+			"integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/unset-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+			"integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+			"license": "MIT",
+			"dependencies": {
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/has-value": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+			"integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+			"license": "MIT",
+			"dependencies": {
+				"get-value": "^2.0.3",
+				"has-values": "^0.1.4",
+				"isobject": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+			"integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+			"license": "MIT",
+			"dependencies": {
+				"isarray": "1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/has-values": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+			"integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"license": "MIT"
+		},
+		"node_modules/untildify": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/upath": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+			"devOptional": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4",
+				"yarn": "*"
+			}
+		},
+		"node_modules/update-browserslist-db": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+			"integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"escalade": "^3.1.2",
+				"picocolors": "^1.0.1"
+			},
+			"bin": {
+				"update-browserslist-db": "cli.js"
+			},
+			"peerDependencies": {
+				"browserslist": ">= 4.21.0"
+			}
+		},
+		"node_modules/upper-case": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+			"integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+			"deprecated": "Please see https://github.com/lydell/urix#deprecated",
+			"license": "MIT"
+		},
+		"node_modules/url": {
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+			"integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
+			"license": "MIT",
+			"dependencies": {
+				"punycode": "^1.4.1",
+				"qs": "^6.12.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/url-loader": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz",
+			"integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^1.2.3",
+				"mime": "^2.4.4",
+				"schema-utils": "^2.5.0"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"peerDependencies": {
+				"file-loader": "*",
+				"webpack": "^4.0.0"
+			},
+			"peerDependenciesMeta": {
+				"file-loader": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/url-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/url-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/url-parse": {
+			"version": "1.5.10",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+			"license": "MIT",
+			"dependencies": {
+				"querystringify": "^2.1.1",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"node_modules/url/node_modules/punycode": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+			"license": "MIT"
+		},
+		"node_modules/use": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/util": {
+			"version": "0.12.3",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.12.3.tgz",
+			"integrity": "sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==",
+			"license": "MIT",
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"is-arguments": "^1.0.4",
+				"is-generator-function": "^1.0.7",
+				"is-typed-array": "^1.1.3",
+				"safe-buffer": "^5.1.2",
+				"which-typed-array": "^1.1.2"
+			}
+		},
+		"node_modules/util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+			"license": "MIT"
+		},
+		"node_modules/util.promisify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+			"integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"define-properties": "^1.1.2",
+				"object.getownpropertydescriptors": "^2.0.3"
+			}
+		},
+		"node_modules/utila": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+			"integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/utils-merge": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
+		"node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"node_modules/vanilla-picker": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.8.0.tgz",
+			"integrity": "sha512-NPBxrtLi2LA2mEyRLW+Lyt7Eqtm0t0SmKqscE5RaugXLtJXXjPzy6r65fqLiQkhRc2WoLnmj2m/EnTWKN4hL+g==",
+			"license": "ISC",
+			"dependencies": {
+				"@sphinxxxx/color-conversion": "^2.2.1",
+				"drag-tracker": "^1.0.0"
+			}
+		},
+		"node_modules/vary": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/vendors": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+			"integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/verror": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+			"dev": true,
+			"engines": [
+				"node >=0.6.0"
+			],
+			"license": "MIT",
+			"dependencies": {
+				"assert-plus": "^1.0.0",
+				"core-util-is": "1.0.2",
+				"extsprintf": "^1.2.0"
+			}
+		},
+		"node_modules/verror/node_modules/core-util-is": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+			"integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/vm-browserify": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+			"license": "MIT"
+		},
+		"node_modules/vue": {
+			"version": "2.6.10",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
+			"integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==",
+			"deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+			"license": "MIT"
+		},
+		"node_modules/vue-class-component": {
+			"version": "6.3.2",
+			"resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
+			"integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
+			"license": "MIT"
+		},
+		"node_modules/vue-cli-plugin-i18n": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-1.0.1.tgz",
+			"integrity": "sha512-sLo6YzudaWgn5dOMvrKixE5bb/onYGxcxm+0YexqoOx0QtR+7hZ/P5WPFBMM9v/2i1ec2YYe2PvKTBel7KE+tA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^4.1.0",
+				"deepmerge": "^4.2.0",
+				"dotenv": "^8.2.0",
+				"flat": "^5.0.0",
+				"rimraf": "^3.0.0",
+				"vue": "^2.6.11",
+				"vue-i18n": "^8.17.0",
+				"vue-i18n-extract": "1.0.2"
+			}
+		},
+		"node_modules/vue-cli-plugin-i18n/node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/vue-cli-plugin-i18n/node_modules/vue": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+			"integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+			"deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@vue/compiler-sfc": "2.7.16",
+				"csstype": "^3.1.0"
+			}
+		},
+		"node_modules/vue-cli-plugin-vuetify": {
+			"version": "2.0.8",
+			"resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.8.tgz",
+			"integrity": "sha512-BHn9wwj/+B9v25mhZq2dV8NafM2LbogymjluPP+CjDnIdcwR3hW38r3nyKsZNPB1jXfWXsvVszipS3b8FqOBCg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"null-loader": "^3.0.0",
+				"semver": "^7.1.2",
+				"shelljs": "^0.8.3"
+			},
+			"peerDependenciesMeta": {
+				"sass-loader": {
+					"optional": true
+				},
+				"vuetify-loader": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vue-cli-plugin-vuetify/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/vue-color-picker-wheel": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/vue-color-picker-wheel/-/vue-color-picker-wheel-0.4.3.tgz",
+			"integrity": "sha512-LBXGkWOCLSmt4m/klDjHHEk3sCsfTNSs9NBfbDU3TSEBb9vwfXD4tYsCO9lCO09iTDYt3rRbhUmxUBxYJX7Dcg==",
+			"license": "MIT"
+		},
+		"node_modules/vue-cookie": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/vue-cookie/-/vue-cookie-1.1.4.tgz",
+			"integrity": "sha512-lxWIzmUTCVra0H7YPbNpYx0wbTQThV+n7ueUOcqtK8dlckmfB8fcyf4OEiRuQUd7iiVub2T3IDlWiisEM5Ku0Q==",
+			"license": "MIT",
+			"dependencies": {
+				"tiny-cookie": "^1.0"
+			}
+		},
+		"node_modules/vue-dayjs-plugin": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/vue-dayjs-plugin/-/vue-dayjs-plugin-1.0.0.tgz",
+			"integrity": "sha512-fgA2Xw2NOjDdmRca0JA+JcVzBWkBEjoPRvsZ+wJEWycXkloQewn4HSRRoawWW4//2brb+SoLTDHi+DDeex8LDA==",
+			"license": "MIT",
+			"dependencies": {
+				"dayjs": "^1.8.16"
+			},
+			"peerDependencies": {
+				"vue": ">=1.x.x"
+			}
+		},
+		"node_modules/vue-demi": {
+			"version": "0.13.11",
+			"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+			"integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+			"hasInstallScript": true,
+			"license": "MIT",
+			"bin": {
+				"vue-demi-fix": "bin/vue-demi-fix.js",
+				"vue-demi-switch": "bin/vue-demi-switch.js"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": "^1.0.0-rc.1",
+				"vue": "^3.0.0-0 || ^2.6.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vue-eslint-parser": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-4.0.3.tgz",
+			"integrity": "sha512-AUeQsYdO6+7QXCems+WvGlrXd37PHv/zcRQSQdY1xdOMwdFAPEnMBsv7zPvk0TPGulXkK/5p/ITgrjiYB7k3ag==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^4.1.0",
+				"eslint-scope": "^4.0.0",
+				"eslint-visitor-keys": "^1.0.0",
+				"espree": "^4.1.0",
+				"esquery": "^1.0.1",
+				"lodash": "^4.17.11"
+			},
+			"engines": {
+				"node": ">=6.5"
+			},
+			"peerDependencies": {
+				"eslint": "^5.0.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/acorn": {
+			"version": "6.4.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esrecurse": "^4.1.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/espree": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz",
+			"integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"acorn": "^6.0.2",
+				"acorn-jsx": "^5.0.0",
+				"eslint-visitor-keys": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/vue-functional-data-merge": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-2.0.7.tgz",
+			"integrity": "sha512-pvLc+H+x2prwBj/uSEIITyxjz/7ZUVVK8uYbrYMmhDvMXnzh9OvQvVEwcOSBQjsubd4Eq41/CSJaWzy4hemMNQ==",
+			"license": "MIT"
+		},
+		"node_modules/vue-hot-reload-api": {
+			"version": "2.3.4",
+			"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+			"integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
+			"license": "MIT"
+		},
+		"node_modules/vue-i18n": {
+			"version": "8.17.3",
+			"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.17.3.tgz",
+			"integrity": "sha512-sWjGOL7dXo6rYcPQmlY8FN/beLxq2aCnTZMSxfW0yW78rRGpqWrqXJURH56kvMYCnyNCepBjGWEEW0rbFiig5Q==",
+			"license": "MIT"
+		},
+		"node_modules/vue-i18n-extract": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/vue-i18n-extract/-/vue-i18n-extract-1.0.2.tgz",
+			"integrity": "sha512-+zwDKvle4KcfloXZnj5hF01ViKDiFr5RMx5507D7oyDXpSleRpekF5YHgZa/+Ra6Go68//z0Nya58J9tKFsCjw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cli-table3": "^0.5.1",
+				"dot-object": "^1.7.1",
+				"esm": "^3.2.13",
+				"glob": "^7.1.3",
+				"is-valid-glob": "^1.0.0",
+				"yargs": "^13.2.2"
+			},
+			"bin": {
+				"vue-i18n-extract": "dist-node/index.bin.js"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/ansi-regex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+			"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/cli-table3": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
+			"integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"object-assign": "^4.1.0",
+				"string-width": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"optionalDependencies": {
+				"colors": "^1.1.2"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/cliui": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+			"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"string-width": "^3.1.0",
+				"strip-ansi": "^5.2.0",
+				"wrap-ansi": "^5.1.0"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/cliui/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/cliui/node_modules/string-width": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+			"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^7.0.1",
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/cliui/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/emoji-regex": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/vue-i18n-extract/node_modules/find-up": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/locate-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^3.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/p-locate": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/require-main-filename": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/vue-i18n-extract/node_modules/string-width": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/strip-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/wrap-ansi": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+			"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^3.2.0",
+				"string-width": "^3.0.0",
+				"strip-ansi": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/wrap-ansi/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/wrap-ansi/node_modules/string-width": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+			"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^7.0.1",
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/wrap-ansi/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/yargs": {
+			"version": "13.3.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+			"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cliui": "^5.0.0",
+				"find-up": "^3.0.0",
+				"get-caller-file": "^2.0.1",
+				"require-directory": "^2.1.1",
+				"require-main-filename": "^2.0.0",
+				"set-blocking": "^2.0.0",
+				"string-width": "^3.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^13.1.2"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/yargs-parser": {
+			"version": "13.1.2",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+			"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"camelcase": "^5.0.0",
+				"decamelize": "^1.2.0"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/yargs/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/yargs/node_modules/string-width": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+			"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^7.0.1",
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-i18n-extract/node_modules/yargs/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/vue-imask": {
+			"version": "6.6.3",
+			"resolved": "https://registry.npmjs.org/vue-imask/-/vue-imask-6.6.3.tgz",
+			"integrity": "sha512-Rc9GqMk9tLTRZDbyVQrswjwFZylOnHTIWWMNvktpGc//I6Qy2CX49BHHgOvBncuJtAbFlzAvvBSieEk9MdreJw==",
+			"license": "MIT",
+			"dependencies": {
+				"imask": "^6.6.3",
+				"vue-demi": "^0.13.11"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": ">=1.0.0",
+				"vue": ">=2.2.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vue-jsoneditor": {
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/vue-jsoneditor/-/vue-jsoneditor-1.0.13.tgz",
+			"integrity": "sha512-dC4DBOmf9khDBzSauLLRI4AuoSha2A5L3q0ztR3tFDFGEYMJsk5G6ya2snyO3KkW8SyJKk+FcOfgAJtpXopa0A==",
+			"dependencies": {
+				"jsoneditor": "^5.10.1",
+				"vue": "^2.5.2"
+			},
+			"engines": {
+				"node": ">= 4.0.0",
+				"npm": ">= 3.0.0"
+			}
+		},
+		"node_modules/vue-loader": {
+			"version": "15.7.1",
+			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.1.tgz",
+			"integrity": "sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA==",
+			"license": "MIT",
+			"dependencies": {
+				"@vue/component-compiler-utils": "^3.0.0",
+				"hash-sum": "^1.0.2",
+				"loader-utils": "^1.1.0",
+				"vue-hot-reload-api": "^2.3.0",
+				"vue-style-loader": "^4.1.0"
+			},
+			"peerDependencies": {
+				"css-loader": "*",
+				"webpack": "^4.1.0 || ^5.0.0-0"
+			}
+		},
+		"node_modules/vue-loader/node_modules/hash-sum": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+			"license": "MIT"
+		},
+		"node_modules/vue-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/vue-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/vue-lodash": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/vue-lodash/-/vue-lodash-2.0.2.tgz",
+			"integrity": "sha512-qC0A6mkF5yUt9Wy2zMa8qGpt+/JTjtlJ+ch1UKfr3eWscTrlK0FlD5GhfPaU/21ZOlZcRXsFriqf/ddchYA6CQ==",
+			"license": "AFL-2.0",
+			"dependencies": {
+				"lodash": "^4.17.11"
+			},
+			"peerDependencies": {
+				"vue": ">= 2.0.0"
+			}
+		},
+		"node_modules/vue-moment": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/vue-moment/-/vue-moment-4.1.0.tgz",
+			"integrity": "sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw==",
+			"license": "MIT",
+			"dependencies": {
+				"moment": "^2.19.2"
+			},
+			"peerDependencies": {
+				"vue": ">=1.x.x"
+			}
+		},
+		"node_modules/vue-property-decorator": {
+			"version": "7.3.0",
+			"resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-7.3.0.tgz",
+			"integrity": "sha512-HarXfTQ/Nxm4s/APpAaGIGHq5ZzslApImQy8ZrtkfGamw8rUFAVgMS5C50/AQ80+wfw3Wpnf4bNzbmj75m/k2Q==",
+			"license": "MIT",
+			"dependencies": {
+				"vue-class-component": "^6.2.0"
+			}
+		},
+		"node_modules/vue-router": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz",
+			"integrity": "sha512-vLLoY452L+JBpALMP5UHum9+7nzR9PeIBCghU9ZtJ1eWm6ieUI8Zb/DI3MYxH32bxkjzYV1LRjNv4qr8d+uX/w==",
+			"license": "MIT"
+		},
+		"node_modules/vue-style-loader": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+			"integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
+			"license": "MIT",
+			"dependencies": {
+				"hash-sum": "^1.0.2",
+				"loader-utils": "^1.0.2"
+			}
+		},
+		"node_modules/vue-style-loader/node_modules/hash-sum": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+			"license": "MIT"
+		},
+		"node_modules/vue-style-loader/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/vue-style-loader/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/vue-template-compiler": {
+			"version": "2.6.10",
+			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz",
+			"integrity": "sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"de-indent": "^1.0.2",
+				"he": "^1.1.0"
+			}
+		},
+		"node_modules/vue-template-es2015-compiler": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
+			"integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
+			"license": "MIT"
+		},
+		"node_modules/vue-timers": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/vue-timers/-/vue-timers-2.0.4.tgz",
+			"integrity": "sha512-QOEVdO4V4o9WjFG6C0Kn9tfdTeeECjqvEQozcQlfL1Tn8v0qx4uUPhTYoc1+s6qoJnSbu8f68x8+nm1ZEir0kw==",
+			"license": "MIT"
+		},
+		"node_modules/vue-underscore": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/vue-underscore/-/vue-underscore-0.1.4.tgz",
+			"integrity": "sha512-VRTHVW75DWWP/FqIBae/02EGm3MM4uju0tUXGSCXfdjFE+V3XfsIlPJAG2gVbJCKQoqylhr3OV9wFNM1Up/OcA==",
+			"license": "MIT",
+			"dependencies": {
+				"underscore": "^1.8.3"
+			}
+		},
+		"node_modules/vuedraggable": {
+			"version": "2.24.3",
+			"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+			"integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+			"license": "MIT",
+			"dependencies": {
+				"sortablejs": "1.10.2"
+			}
+		},
+		"node_modules/vuejs-datepicker": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/vuejs-datepicker/-/vuejs-datepicker-1.6.2.tgz",
+			"integrity": "sha512-PkC4vxzFBo7i6FSCUAJfnaWOx6VkKbOqxijSGHHlWxh8FIUKEZVtFychkonVWtK3iwWfhmYtqHcwsmgxefLpLQ==",
+			"license": "MIT",
+			"peerDependencies": {
+				"vue": "^2.6.10"
+			}
+		},
+		"node_modules/vuejs-logger": {
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/vuejs-logger/-/vuejs-logger-1.5.3.tgz",
+			"integrity": "sha512-jw+AQ+IMJBz18fA4opHsqaU7P7yQNugoGywT6i3DCd1BWqg9eUx03Fr21kayqGcP4dxUwhVkkjuOyeirxLJC8g==",
+			"license": "MIT",
+			"dependencies": {
+				"es6-object-assign": "1.1.0"
+			}
+		},
+		"node_modules/vuetify": {
+			"version": "2.4.8",
+			"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.4.8.tgz",
+			"integrity": "sha512-rJYyzSO4Qsm/Q79W4FAUedgIDzUvx2uXzXXQ7OB2z9kAAkVOpTdMFY0CnpBcvlYbXOYy/mJ81/yUCV1ZAvJ3FQ==",
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/johnleider"
+			},
+			"peerDependencies": {
+				"vue": "^2.6.4"
+			}
+		},
+		"node_modules/vuetify-loader": {
+			"version": "1.7.2",
+			"resolved": "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.7.2.tgz",
+			"integrity": "sha512-2GSo4KvRAOThBsj8mvtIEeIoyBAZx38GDfh8D90e/or7Hzx4813krJKvcQAllyLO/Ln0eQWrq2IuvBXnZ55cSA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"decache": "^4.6.0",
+				"file-loader": "^6.2.0",
+				"loader-utils": "^2.0.0"
+			},
+			"peerDependencies": {
+				"vue-template-compiler": "^2.6.10",
+				"vuetify": "^1.3.0 || ^2.0.0",
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/vuetify-loader/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/vuetify-loader/node_modules/file-loader": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/vuetify-loader/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/vuex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz",
+			"integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w==",
+			"license": "MIT"
+		},
+		"node_modules/w3c-hr-time": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+			"deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"browser-process-hrtime": "^1.0.0"
+			}
+		},
+		"node_modules/w3c-xmlserializer": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
+			"integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"domexception": "^1.0.1",
+				"webidl-conversions": "^4.0.2",
+				"xml-name-validator": "^3.0.0"
+			}
+		},
+		"node_modules/watchpack": {
+			"version": "1.7.5",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+			"integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+			"license": "MIT",
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"neo-async": "^2.5.0"
+			},
+			"optionalDependencies": {
+				"chokidar": "^3.4.1",
+				"watchpack-chokidar2": "^2.0.1"
+			}
+		},
+		"node_modules/watchpack-chokidar2": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+			"integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"chokidar": "^2.1.8"
+			}
+		},
+		"node_modules/watchpack/node_modules/anymatch": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+			"license": "ISC",
+			"optional": true,
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/watchpack/node_modules/binary-extensions": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+			"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/watchpack/node_modules/braces": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"fill-range": "^7.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/watchpack/node_modules/chokidar": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"anymatch": "~3.1.2",
+				"braces": "~3.0.2",
+				"glob-parent": "~5.1.2",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.6.0"
+			},
+			"engines": {
+				"node": ">= 8.10.0"
+			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.2"
+			}
+		},
+		"node_modules/watchpack/node_modules/fill-range": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/watchpack/node_modules/fsevents": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
+		"node_modules/watchpack/node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"license": "ISC",
+			"optional": true,
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/watchpack/node_modules/is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"binary-extensions": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/watchpack/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/watchpack/node_modules/readdirp": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8.10.0"
+			}
+		},
+		"node_modules/watchpack/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/wbuf": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimalistic-assert": "^1.0.0"
+			}
+		},
+		"node_modules/wcwidth": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+			"integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"defaults": "^1.0.3"
+			}
+		},
+		"node_modules/webidl-conversions": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+			"integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+			"dev": true,
+			"license": "BSD-2-Clause"
+		},
+		"node_modules/webpack": {
+			"version": "4.47.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
+			"integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.9.0",
+				"@webassemblyjs/helper-module-context": "1.9.0",
+				"@webassemblyjs/wasm-edit": "1.9.0",
+				"@webassemblyjs/wasm-parser": "1.9.0",
+				"acorn": "^6.4.1",
+				"ajv": "^6.10.2",
+				"ajv-keywords": "^3.4.1",
+				"chrome-trace-event": "^1.0.2",
+				"enhanced-resolve": "^4.5.0",
+				"eslint-scope": "^4.0.3",
+				"json-parse-better-errors": "^1.0.2",
+				"loader-runner": "^2.4.0",
+				"loader-utils": "^1.2.3",
+				"memory-fs": "^0.4.1",
+				"micromatch": "^3.1.10",
+				"mkdirp": "^0.5.3",
+				"neo-async": "^2.6.1",
+				"node-libs-browser": "^2.2.1",
+				"schema-utils": "^1.0.0",
+				"tapable": "^1.1.3",
+				"terser-webpack-plugin": "^1.4.3",
+				"watchpack": "^1.7.4",
+				"webpack-sources": "^1.4.1"
+			},
+			"bin": {
+				"webpack": "bin/webpack.js"
+			},
+			"engines": {
+				"node": ">=6.11.5"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
+				},
+				"webpack-command": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-bundle-analyzer": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
+			"integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"acorn": "^7.1.1",
+				"acorn-walk": "^7.1.1",
+				"bfj": "^6.1.1",
+				"chalk": "^2.4.1",
+				"commander": "^2.18.0",
+				"ejs": "^2.6.1",
+				"express": "^4.16.3",
+				"filesize": "^3.6.1",
+				"gzip-size": "^5.0.0",
+				"lodash": "^4.17.19",
+				"mkdirp": "^0.5.1",
+				"opener": "^1.5.1",
+				"ws": "^6.0.0"
+			},
+			"bin": {
+				"webpack-bundle-analyzer": "lib/bin/analyzer.js"
+			},
+			"engines": {
+				"node": ">= 6.14.4"
+			}
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/webpack-chain": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
+			"integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==",
+			"deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+			"dev": true,
+			"license": "MPL-2.0",
+			"dependencies": {
+				"deepmerge": "^1.5.2",
+				"javascript-stringify": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/webpack-chain/node_modules/deepmerge": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
+			"integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/webpack-dev-middleware": {
+			"version": "3.7.3",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
+			"integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"memory-fs": "^0.4.1",
+				"mime": "^2.4.4",
+				"mkdirp": "^0.5.1",
+				"range-parser": "^1.2.1",
+				"webpack-log": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 6"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/webpack-dev-server": {
+			"version": "3.11.3",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
+			"integrity": "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-html-community": "0.0.8",
+				"bonjour": "^3.5.0",
+				"chokidar": "^2.1.8",
+				"compression": "^1.7.4",
+				"connect-history-api-fallback": "^1.6.0",
+				"debug": "^4.1.1",
+				"del": "^4.1.1",
+				"express": "^4.17.1",
+				"html-entities": "^1.3.1",
+				"http-proxy-middleware": "0.19.1",
+				"import-local": "^2.0.0",
+				"internal-ip": "^4.3.0",
+				"ip": "^1.1.5",
+				"is-absolute-url": "^3.0.3",
+				"killable": "^1.0.1",
+				"loglevel": "^1.6.8",
+				"opn": "^5.5.0",
+				"p-retry": "^3.0.1",
+				"portfinder": "^1.0.26",
+				"schema-utils": "^1.0.0",
+				"selfsigned": "^1.10.8",
+				"semver": "^6.3.0",
+				"serve-index": "^1.9.1",
+				"sockjs": "^0.3.21",
+				"sockjs-client": "^1.5.0",
+				"spdy": "^4.0.2",
+				"strip-ansi": "^3.0.1",
+				"supports-color": "^6.1.0",
+				"url": "^0.11.0",
+				"webpack-dev-middleware": "^3.7.2",
+				"webpack-log": "^2.0.0",
+				"ws": "^6.2.1",
+				"yargs": "^13.3.2"
 			},
-			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"deepmerge": {
-					"version": "4.2.2",
-					"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-					"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"vue": {
-					"version": "2.7.13",
-					"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz",
-					"integrity": "sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==",
-					"dev": true,
-					"requires": {
-						"@vue/compiler-sfc": "2.7.13",
-						"csstype": "^3.1.0"
-					}
+			"bin": {
+				"webpack-dev-server": "bin/webpack-dev-server.js"
+			},
+			"engines": {
+				"node": ">= 6.11.5"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
 				}
 			}
 		},
-		"vue-cli-plugin-vuetify": {
-			"version": "2.0.8",
-			"resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.8.tgz",
-			"integrity": "sha512-BHn9wwj/+B9v25mhZq2dV8NafM2LbogymjluPP+CjDnIdcwR3hW38r3nyKsZNPB1jXfWXsvVszipS3b8FqOBCg==",
+		"node_modules/webpack-dev-server/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
 			"dev": true,
-			"requires": {
-				"null-loader": "^3.0.0",
-				"semver": "^7.1.2",
-				"shelljs": "^0.8.3"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.8",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"vue-color-picker-wheel": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/vue-color-picker-wheel/-/vue-color-picker-wheel-0.4.3.tgz",
-			"integrity": "sha512-LBXGkWOCLSmt4m/klDjHHEk3sCsfTNSs9NBfbDU3TSEBb9vwfXD4tYsCO9lCO09iTDYt3rRbhUmxUBxYJX7Dcg=="
-		},
-		"vue-cookie": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/vue-cookie/-/vue-cookie-1.1.4.tgz",
-			"integrity": "sha512-lxWIzmUTCVra0H7YPbNpYx0wbTQThV+n7ueUOcqtK8dlckmfB8fcyf4OEiRuQUd7iiVub2T3IDlWiisEM5Ku0Q==",
-			"requires": {
-				"tiny-cookie": "^1.0"
+		"node_modules/webpack-dev-server/node_modules/cliui": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+			"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"string-width": "^3.1.0",
+				"strip-ansi": "^5.2.0",
+				"wrap-ansi": "^5.1.0"
 			}
 		},
-		"vue-dayjs-plugin": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/vue-dayjs-plugin/-/vue-dayjs-plugin-1.0.0.tgz",
-			"integrity": "sha512-fgA2Xw2NOjDdmRca0JA+JcVzBWkBEjoPRvsZ+wJEWycXkloQewn4HSRRoawWW4//2brb+SoLTDHi+DDeex8LDA==",
-			"requires": {
-				"dayjs": "^1.8.16"
+		"node_modules/webpack-dev-server/node_modules/cliui/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vue-demi": {
-			"version": "0.13.11",
-			"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
-			"integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="
-		},
-		"vue-eslint-parser": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
-			"integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==",
+		"node_modules/webpack-dev-server/node_modules/cliui/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"debug": "^3.1.0",
-				"eslint-scope": "^3.7.1",
-				"eslint-visitor-keys": "^1.0.0",
-				"espree": "^3.5.2",
-				"esquery": "^1.0.0",
-				"lodash": "^4.17.4"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"eslint-scope": {
-					"version": "3.7.3",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
-					"integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"esrecurse": "^4.1.0",
-						"estraverse": "^4.1.1"
-					}
-				}
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vue-functional-data-merge": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-2.0.7.tgz",
-			"integrity": "sha512-pvLc+H+x2prwBj/uSEIITyxjz/7ZUVVK8uYbrYMmhDvMXnzh9OvQvVEwcOSBQjsubd4Eq41/CSJaWzy4hemMNQ=="
-		},
-		"vue-hot-reload-api": {
-			"version": "2.3.4",
-			"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
-			"integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="
-		},
-		"vue-i18n": {
-			"version": "8.17.3",
-			"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.17.3.tgz",
-			"integrity": "sha512-sWjGOL7dXo6rYcPQmlY8FN/beLxq2aCnTZMSxfW0yW78rRGpqWrqXJURH56kvMYCnyNCepBjGWEEW0rbFiig5Q=="
+		"node_modules/webpack-dev-server/node_modules/emoji-regex": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+			"dev": true,
+			"license": "MIT"
 		},
-		"vue-i18n-extract": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/vue-i18n-extract/-/vue-i18n-extract-1.0.2.tgz",
-			"integrity": "sha512-+zwDKvle4KcfloXZnj5hF01ViKDiFr5RMx5507D7oyDXpSleRpekF5YHgZa/+Ra6Go68//z0Nya58J9tKFsCjw==",
+		"node_modules/webpack-dev-server/node_modules/find-up": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
 			"dev": true,
-			"requires": {
-				"cli-table3": "^0.5.1",
-				"dot-object": "^1.7.1",
-				"esm": "^3.2.13",
-				"glob": "^7.1.3",
-				"is-valid-glob": "^1.0.0",
-				"yargs": "^13.2.2"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"cliui": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-					"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-					"dev": true,
-					"requires": {
-						"string-width": "^3.1.0",
-						"strip-ansi": "^5.2.0",
-						"wrap-ansi": "^5.1.0"
-					}
-				},
-				"emoji-regex": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-					"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-					"dev": true
-				},
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"get-caller-file": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"require-main-filename": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-					"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"yargs": {
-					"version": "13.3.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-					"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-					"dev": true,
-					"requires": {
-						"cliui": "^5.0.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^3.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^13.1.2"
-					}
-				},
-				"yargs-parser": {
-					"version": "13.1.2",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-					"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					}
-				}
-			}
-		},
-		"vue-imask": {
-			"version": "6.4.3",
-			"resolved": "https://registry.npmjs.org/vue-imask/-/vue-imask-6.4.3.tgz",
-			"integrity": "sha512-lGHtknLGZMtWPaQCkeqGrdOpXMq2LfPhiV1NaJ1Kn4YRNXOWFGZt135tRBs5W0gYXTP5g947andrxcJNlPW07g==",
-			"requires": {
-				"imask": "^6.4.3",
-				"vue-demi": "^0.13.11"
+				"locate-path": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vue-jsoneditor": {
-			"version": "1.0.13",
-			"resolved": "https://registry.npmjs.org/vue-jsoneditor/-/vue-jsoneditor-1.0.13.tgz",
-			"integrity": "sha512-dC4DBOmf9khDBzSauLLRI4AuoSha2A5L3q0ztR3tFDFGEYMJsk5G6ya2snyO3KkW8SyJKk+FcOfgAJtpXopa0A==",
-			"requires": {
-				"jsoneditor": "^5.10.1",
-				"vue": "^2.5.2"
+		"node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
+			"version": "0.19.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+			"integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"http-proxy": "^1.17.0",
+				"is-glob": "^4.0.0",
+				"lodash": "^4.17.11",
+				"micromatch": "^3.1.10"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"vue-loader": {
-			"version": "15.7.1",
-			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.1.tgz",
-			"integrity": "sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA==",
-			"requires": {
-				"@vue/component-compiler-utils": "^3.0.0",
-				"hash-sum": "^1.0.2",
-				"loader-utils": "^1.1.0",
-				"vue-hot-reload-api": "^2.3.0",
-				"vue-style-loader": "^4.1.0"
+		"node_modules/webpack-dev-server/node_modules/is-absolute-url": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+			"integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"vue-lodash": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/vue-lodash/-/vue-lodash-2.0.2.tgz",
-			"integrity": "sha512-qC0A6mkF5yUt9Wy2zMa8qGpt+/JTjtlJ+ch1UKfr3eWscTrlK0FlD5GhfPaU/21ZOlZcRXsFriqf/ddchYA6CQ==",
-			"requires": {
-				"lodash": "^4.17.11"
+		"node_modules/webpack-dev-server/node_modules/is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"vue-moment": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/vue-moment/-/vue-moment-4.1.0.tgz",
-			"integrity": "sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw==",
-			"requires": {
-				"moment": "^2.19.2"
+		"node_modules/webpack-dev-server/node_modules/locate-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^3.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vue-property-decorator": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-7.3.0.tgz",
-			"integrity": "sha512-HarXfTQ/Nxm4s/APpAaGIGHq5ZzslApImQy8ZrtkfGamw8rUFAVgMS5C50/AQ80+wfw3Wpnf4bNzbmj75m/k2Q==",
-			"requires": {
-				"vue-class-component": "^6.2.0"
+		"node_modules/webpack-dev-server/node_modules/p-locate": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vue-router": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz",
-			"integrity": "sha512-vLLoY452L+JBpALMP5UHum9+7nzR9PeIBCghU9ZtJ1eWm6ieUI8Zb/DI3MYxH32bxkjzYV1LRjNv4qr8d+uX/w=="
+		"node_modules/webpack-dev-server/node_modules/require-main-filename": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+			"dev": true,
+			"license": "ISC"
 		},
-		"vue-style-loader": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-			"integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
-			"requires": {
-				"hash-sum": "^1.0.2",
-				"loader-utils": "^1.0.2"
+		"node_modules/webpack-dev-server/node_modules/schema-utils": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+			"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^6.1.0",
+				"ajv-errors": "^1.0.0",
+				"ajv-keywords": "^3.1.0"
+			},
+			"engines": {
+				"node": ">= 4"
 			}
 		},
-		"vue-template-compiler": {
-			"version": "2.6.10",
-			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz",
-			"integrity": "sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==",
+		"node_modules/webpack-dev-server/node_modules/string-width": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+			"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
 			"dev": true,
-			"requires": {
-				"de-indent": "^1.0.2",
-				"he": "^1.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^7.0.1",
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vue-template-es2015-compiler": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-			"integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="
-		},
-		"vue-timers": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/vue-timers/-/vue-timers-2.0.4.tgz",
-			"integrity": "sha512-QOEVdO4V4o9WjFG6C0Kn9tfdTeeECjqvEQozcQlfL1Tn8v0qx4uUPhTYoc1+s6qoJnSbu8f68x8+nm1ZEir0kw=="
+		"node_modules/webpack-dev-server/node_modules/string-width/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"vue-underscore": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/vue-underscore/-/vue-underscore-0.1.4.tgz",
-			"integrity": "sha512-VRTHVW75DWWP/FqIBae/02EGm3MM4uju0tUXGSCXfdjFE+V3XfsIlPJAG2gVbJCKQoqylhr3OV9wFNM1Up/OcA==",
-			"requires": {
-				"underscore": "^1.8.3"
+		"node_modules/webpack-dev-server/node_modules/string-width/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vuedraggable": {
-			"version": "2.24.3",
-			"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
-			"integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
-			"requires": {
-				"sortablejs": "1.10.2"
+		"node_modules/webpack-dev-server/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"vuejs-datepicker": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/vuejs-datepicker/-/vuejs-datepicker-1.6.2.tgz",
-			"integrity": "sha512-PkC4vxzFBo7i6FSCUAJfnaWOx6VkKbOqxijSGHHlWxh8FIUKEZVtFychkonVWtK3iwWfhmYtqHcwsmgxefLpLQ=="
+		"node_modules/webpack-dev-server/node_modules/supports-color": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+			"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"vuejs-logger": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/vuejs-logger/-/vuejs-logger-1.5.3.tgz",
-			"integrity": "sha512-jw+AQ+IMJBz18fA4opHsqaU7P7yQNugoGywT6i3DCd1BWqg9eUx03Fr21kayqGcP4dxUwhVkkjuOyeirxLJC8g==",
-			"requires": {
-				"es6-object-assign": "1.1.0"
+		"node_modules/webpack-dev-server/node_modules/wrap-ansi": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+			"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^3.2.0",
+				"string-width": "^3.0.0",
+				"strip-ansi": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vuetify": {
-			"version": "2.4.8",
-			"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.4.8.tgz",
-			"integrity": "sha512-rJYyzSO4Qsm/Q79W4FAUedgIDzUvx2uXzXXQ7OB2z9kAAkVOpTdMFY0CnpBcvlYbXOYy/mJ81/yUCV1ZAvJ3FQ=="
+		"node_modules/webpack-dev-server/node_modules/wrap-ansi/node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"vuetify-loader": {
-			"version": "1.7.2",
-			"resolved": "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.7.2.tgz",
-			"integrity": "sha512-2GSo4KvRAOThBsj8mvtIEeIoyBAZx38GDfh8D90e/or7Hzx4813krJKvcQAllyLO/Ln0eQWrq2IuvBXnZ55cSA==",
+		"node_modules/webpack-dev-server/node_modules/wrap-ansi/node_modules/strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 			"dev": true,
-			"requires": {
-				"decache": "^4.6.0",
-				"file-loader": "^6.2.0",
-				"loader-utils": "^2.0.0"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"file-loader": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-					"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^2.0.0",
-						"schema-utils": "^3.0.0"
-					}
-				},
-				"json5": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-					"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-					"dev": true
-				},
-				"loader-utils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-					"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-					"dev": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^2.1.2"
-					}
-				},
-				"schema-utils": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
-				}
+				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"vuex": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz",
-			"integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w=="
-		},
-		"w3c-hr-time": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+		"node_modules/webpack-dev-server/node_modules/yargs": {
+			"version": "13.3.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+			"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
 			"dev": true,
-			"requires": {
-				"browser-process-hrtime": "^1.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"cliui": "^5.0.0",
+				"find-up": "^3.0.0",
+				"get-caller-file": "^2.0.1",
+				"require-directory": "^2.1.1",
+				"require-main-filename": "^2.0.0",
+				"set-blocking": "^2.0.0",
+				"string-width": "^3.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^13.1.2"
 			}
 		},
-		"w3c-xmlserializer": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-			"integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+		"node_modules/webpack-dev-server/node_modules/yargs-parser": {
+			"version": "13.1.2",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+			"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
 			"dev": true,
-			"requires": {
-				"domexception": "^1.0.1",
-				"webidl-conversions": "^4.0.2",
-				"xml-name-validator": "^3.0.0"
+			"license": "ISC",
+			"dependencies": {
+				"camelcase": "^5.0.0",
+				"decamelize": "^1.2.0"
 			}
 		},
-		"watchpack": {
-			"version": "1.7.5",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-			"integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+		"node_modules/webpack-log": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+			"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
 			"dev": true,
-			"requires": {
-				"chokidar": "^3.4.1",
-				"graceful-fs": "^4.1.2",
-				"neo-async": "^2.5.0",
-				"watchpack-chokidar2": "^2.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-colors": "^3.0.0",
+				"uuid": "^3.3.2"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"watchpack-chokidar2": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-			"integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+		"node_modules/webpack-log/node_modules/ansi-colors": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+			"integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"chokidar": "^2.1.8"
-			},
-			"dependencies": {
-				"anymatch": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"micromatch": "^3.1.4",
-						"normalize-path": "^2.1.1"
-					},
-					"dependencies": {
-						"normalize-path": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-							"integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"remove-trailing-separator": "^1.0.1"
-							}
-						}
-					}
-				},
-				"binary-extensions": {
-					"version": "1.13.1",
-					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-					"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-					"dev": true,
-					"optional": true
-				},
-				"chokidar": {
-					"version": "2.1.8",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.1",
-						"braces": "^2.3.2",
-						"fsevents": "^1.2.7",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.3",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"normalize-path": "^3.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.2.1",
-						"upath": "^1.1.1"
-					}
-				},
-				"fsevents": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"bindings": "^1.5.0",
-						"nan": "^2.12.1"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				},
-				"is-binary-path": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-					"integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"binary-extensions": "^1.0.0"
-					}
-				},
-				"readdirp": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-					"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"graceful-fs": "^4.1.11",
-						"micromatch": "^3.1.10",
-						"readable-stream": "^2.0.2"
-					}
-				}
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"wbuf": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+		"node_modules/webpack-log/node_modules/uuid": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+			"deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
 			"dev": true,
-			"requires": {
-				"minimalistic-assert": "^1.0.0"
+			"license": "MIT",
+			"bin": {
+				"uuid": "bin/uuid"
 			}
 		},
-		"wcwidth": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-			"integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+		"node_modules/webpack-merge": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+			"integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
 			"dev": true,
-			"requires": {
-				"defaults": "^1.0.3"
+			"license": "MIT",
+			"dependencies": {
+				"lodash": "^4.17.15"
 			}
 		},
-		"webidl-conversions": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-			"integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-			"dev": true
+		"node_modules/webpack-sources": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+			"integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+			"license": "MIT",
+			"dependencies": {
+				"source-list-map": "^2.0.0",
+				"source-map": "~0.6.1"
+			}
 		},
-		"webpack": {
-			"version": "4.46.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
-			"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-module-context": "1.9.0",
-				"@webassemblyjs/wasm-edit": "1.9.0",
-				"@webassemblyjs/wasm-parser": "1.9.0",
-				"acorn": "^6.4.1",
-				"ajv": "^6.10.2",
-				"ajv-keywords": "^3.4.1",
-				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^4.5.0",
-				"eslint-scope": "^4.0.3",
-				"json-parse-better-errors": "^1.0.2",
-				"loader-runner": "^2.4.0",
-				"loader-utils": "^1.2.3",
-				"memory-fs": "^0.4.1",
-				"micromatch": "^3.1.10",
-				"mkdirp": "^0.5.3",
-				"neo-async": "^2.6.1",
-				"node-libs-browser": "^2.2.1",
-				"schema-utils": "^1.0.0",
-				"tapable": "^1.1.3",
-				"terser-webpack-plugin": "^1.4.3",
-				"watchpack": "^1.7.4",
-				"webpack-sources": "^1.4.1"
+		"node_modules/webpack/node_modules/acorn": {
+			"version": "6.4.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+			"license": "MIT",
+			"bin": {
+				"acorn": "bin/acorn"
 			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/webpack/node_modules/eslint-scope": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"schema-utils": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
-					}
-				}
+				"esrecurse": "^4.1.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"webpack-bundle-analyzer": {
-			"version": "3.9.0",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
-			"integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
-			"dev": true,
-			"requires": {
-				"acorn": "^7.1.1",
-				"acorn-walk": "^7.1.1",
-				"bfj": "^6.1.1",
-				"chalk": "^2.4.1",
-				"commander": "^2.18.0",
-				"ejs": "^2.6.1",
-				"express": "^4.16.3",
-				"filesize": "^3.6.1",
-				"gzip-size": "^5.0.0",
-				"lodash": "^4.17.19",
-				"mkdirp": "^0.5.1",
-				"opener": "^1.5.1",
-				"ws": "^6.0.0"
+		"node_modules/webpack/node_modules/find-cache-dir": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+			"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+			"license": "MIT",
+			"dependencies": {
+				"commondir": "^1.0.1",
+				"make-dir": "^2.0.0",
+				"pkg-dir": "^3.0.0"
 			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/webpack/node_modules/find-up": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+			"license": "MIT",
 			"dependencies": {
-				"acorn": {
-					"version": "7.4.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-					"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-					"dev": true
-				},
-				"acorn-walk": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-					"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-					"dev": true
-				}
+				"locate-path": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"webpack-chain": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
-			"integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==",
-			"dev": true,
-			"requires": {
-				"deepmerge": "^1.5.2",
-				"javascript-stringify": "^2.0.1"
+		"node_modules/webpack/node_modules/is-wsl": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+			"integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"webpack-dev-middleware": {
-			"version": "3.7.3",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
-			"integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==",
-			"dev": true,
-			"requires": {
-				"memory-fs": "^0.4.1",
-				"mime": "^2.4.4",
-				"mkdirp": "^0.5.1",
-				"range-parser": "^1.2.1",
-				"webpack-log": "^2.0.0"
+		"node_modules/webpack/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"webpack-dev-server": {
-			"version": "3.11.3",
-			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
-			"integrity": "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==",
-			"dev": true,
-			"requires": {
-				"ansi-html-community": "0.0.8",
-				"bonjour": "^3.5.0",
-				"chokidar": "^2.1.8",
-				"compression": "^1.7.4",
-				"connect-history-api-fallback": "^1.6.0",
-				"debug": "^4.1.1",
-				"del": "^4.1.1",
-				"express": "^4.17.1",
-				"html-entities": "^1.3.1",
-				"http-proxy-middleware": "0.19.1",
-				"import-local": "^2.0.0",
-				"internal-ip": "^4.3.0",
-				"ip": "^1.1.5",
-				"is-absolute-url": "^3.0.3",
-				"killable": "^1.0.1",
-				"loglevel": "^1.6.8",
-				"opn": "^5.5.0",
-				"p-retry": "^3.0.1",
-				"portfinder": "^1.0.26",
-				"schema-utils": "^1.0.0",
-				"selfsigned": "^1.10.8",
-				"semver": "^6.3.0",
-				"serve-index": "^1.9.1",
-				"sockjs": "^0.3.21",
-				"sockjs-client": "^1.5.0",
-				"spdy": "^4.0.2",
-				"strip-ansi": "^3.0.1",
-				"supports-color": "^6.1.0",
-				"url": "^0.11.0",
-				"webpack-dev-middleware": "^3.7.2",
-				"webpack-log": "^2.0.0",
-				"ws": "^6.2.1",
-				"yargs": "^13.3.2"
+		"node_modules/webpack/node_modules/loader-utils": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^1.0.1"
 			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/webpack/node_modules/locate-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"anymatch": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^3.1.4",
-						"normalize-path": "^2.1.1"
-					},
-					"dependencies": {
-						"normalize-path": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-							"integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-							"dev": true,
-							"requires": {
-								"remove-trailing-separator": "^1.0.1"
-							}
-						}
-					}
-				},
-				"binary-extensions": {
-					"version": "1.13.1",
-					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-					"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-					"dev": true
-				},
-				"chokidar": {
-					"version": "2.1.8",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.1",
-						"braces": "^2.3.2",
-						"fsevents": "^1.2.7",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.3",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"normalize-path": "^3.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.2.1",
-						"upath": "^1.1.1"
-					}
-				},
-				"cliui": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-					"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-					"dev": true,
-					"requires": {
-						"string-width": "^3.1.0",
-						"strip-ansi": "^5.2.0",
-						"wrap-ansi": "^5.1.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-							"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "5.2.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-							"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"emoji-regex": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-					"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-					"dev": true
-				},
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"fsevents": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"bindings": "^1.5.0",
-						"nan": "^2.12.1"
-					}
-				},
-				"get-caller-file": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-					"dev": true
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-							"dev": true,
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-					"dev": true
-				},
-				"http-proxy-middleware": {
-					"version": "0.19.1",
-					"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-					"integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-					"dev": true,
-					"requires": {
-						"http-proxy": "^1.17.0",
-						"is-glob": "^4.0.0",
-						"lodash": "^4.17.11",
-						"micromatch": "^3.1.10"
-					}
-				},
-				"is-absolute-url": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-					"integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-					"dev": true
-				},
-				"is-binary-path": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-					"integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-					"dev": true,
-					"requires": {
-						"binary-extensions": "^1.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"readdirp": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-					"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.11",
-						"micromatch": "^3.1.10",
-						"readable-stream": "^2.0.2"
-					}
-				},
-				"require-main-filename": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
-					}
-				},
-				"string-width": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-							"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "5.2.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-							"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-					"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-							"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "5.2.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-							"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"yargs": {
-					"version": "13.3.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-					"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-					"dev": true,
-					"requires": {
-						"cliui": "^5.0.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^3.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^13.1.2"
-					}
-				},
-				"yargs-parser": {
-					"version": "13.1.2",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-					"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					}
-				}
+				"p-locate": "^3.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"webpack-log": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-			"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-			"dev": true,
-			"requires": {
-				"ansi-colors": "^3.0.0",
-				"uuid": "^3.3.2"
+		"node_modules/webpack/node_modules/make-dir": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+			"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+			"license": "MIT",
+			"dependencies": {
+				"pify": "^4.0.1",
+				"semver": "^5.6.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/webpack/node_modules/p-locate": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/webpack/node_modules/pify": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/webpack/node_modules/pkg-dir": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+			"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+			"license": "MIT",
+			"dependencies": {
+				"find-up": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/webpack/node_modules/schema-utils": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+			"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^6.1.0",
+				"ajv-errors": "^1.0.0",
+				"ajv-keywords": "^3.1.0"
+			},
+			"engines": {
+				"node": ">= 4"
 			}
 		},
-		"webpack-merge": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-			"integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.15"
+		"node_modules/webpack/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver"
 			}
 		},
-		"webpack-sources": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-			"integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-			"dev": true,
-			"requires": {
-				"source-list-map": "^2.0.0",
-				"source-map": "~0.6.1"
+		"node_modules/webpack/node_modules/terser-webpack-plugin": {
+			"version": "1.4.6",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.6.tgz",
+			"integrity": "sha512-2lBVf/VMVIddjSn3GqbT90GvIJ/eYXJkt8cTzU7NbjKqK8fwv18Ftr4PlbF46b/e88743iZFL5Dtr/rC4hjIeA==",
+			"license": "MIT",
+			"dependencies": {
+				"cacache": "^12.0.2",
+				"find-cache-dir": "^2.1.0",
+				"is-wsl": "^1.1.0",
+				"schema-utils": "^1.0.0",
+				"serialize-javascript": "^4.0.0",
+				"source-map": "^0.6.1",
+				"terser": "^4.1.2",
+				"webpack-sources": "^1.4.0",
+				"worker-farm": "^1.7.0"
+			},
+			"engines": {
+				"node": ">= 6.9.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0"
 			}
 		},
-		"websocket-driver": {
+		"node_modules/websocket-driver": {
 			"version": "0.7.4",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
 			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-			"requires": {
+			"license": "Apache-2.0",
+			"dependencies": {
 				"http-parser-js": ">=0.5.1",
 				"safe-buffer": ">=5.1.0",
 				"websocket-extensions": ">=0.1.1"
+			},
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"websocket-extensions": {
+		"node_modules/websocket-extensions": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
+			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8.0"
+			}
 		},
-		"webstomp-client": {
+		"node_modules/webstomp-client": {
 			"version": "1.2.6",
 			"resolved": "https://registry.npmjs.org/webstomp-client/-/webstomp-client-1.2.6.tgz",
-			"integrity": "sha512-9HajO6Ki2ViEGIusLZtjM2lcO2VaQUvtXhLQQ4Cm543RLjfTCEgI3sFaiXts3TvfZgrtY/vI/+qUkm2qWD/NVg=="
+			"integrity": "sha512-9HajO6Ki2ViEGIusLZtjM2lcO2VaQUvtXhLQQ4Cm543RLjfTCEgI3sFaiXts3TvfZgrtY/vI/+qUkm2qWD/NVg==",
+			"license": "Apache-2.0"
 		},
-		"whatwg-encoding": {
+		"node_modules/whatwg-encoding": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
 			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
 			"dev": true,
-			"requires": {
-				"iconv-lite": "0.4.24"
-			},
+			"license": "MIT",
 			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
+				"iconv-lite": "0.4.24"
 			}
 		},
-		"whatwg-mimetype": {
+		"node_modules/whatwg-mimetype": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
 			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
-		"whatwg-url": {
+		"node_modules/whatwg-url": {
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
 			"integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"lodash.sortby": "^4.7.0",
 				"tr46": "^1.0.1",
 				"webidl-conversions": "^4.0.2"
 			}
 		},
-		"which": {
+		"node_modules/which": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
 			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
 			"dev": true,
-			"requires": {
+			"license": "ISC",
+			"dependencies": {
 				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
 			}
 		},
-		"which-boxed-primitive": {
+		"node_modules/which-boxed-primitive": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
 			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"is-bigint": "^1.0.1",
 				"is-boolean-object": "^1.1.0",
 				"is-number-object": "^1.0.4",
 				"is-string": "^1.0.5",
 				"is-symbol": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"which-collection": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-			"integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-			"requires": {
-				"is-map": "^2.0.1",
-				"is-set": "^2.0.1",
-				"is-weakmap": "^2.0.1",
-				"is-weakset": "^2.0.1"
+		"node_modules/which-collection": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+			"integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+			"license": "MIT",
+			"dependencies": {
+				"is-map": "^2.0.3",
+				"is-set": "^2.0.3",
+				"is-weakmap": "^2.0.2",
+				"is-weakset": "^2.0.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"which-module": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-			"integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
-			"dev": true
+		"node_modules/which-module": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+			"integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+			"dev": true,
+			"license": "ISC"
 		},
-		"which-pm-runs": {
+		"node_modules/which-pm-runs": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz",
 			"integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==",
 			"dev": true,
-			"optional": true
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"which-typed-array": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-			"integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
-			"requires": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"es-abstract": "^1.20.0",
+		"node_modules/which-typed-array": {
+			"version": "1.1.15",
+			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+			"integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+			"license": "MIT",
+			"dependencies": {
+				"available-typed-arrays": "^1.0.7",
+				"call-bind": "^1.0.7",
 				"for-each": "^0.3.3",
-				"has-tostringtag": "^1.0.0",
-				"is-typed-array": "^1.1.9"
+				"gopd": "^1.0.1",
+				"has-tostringtag": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"wide-align": {
+		"node_modules/wide-align": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
 			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
 			"dev": true,
+			"license": "ISC",
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"string-width": "^1.0.2 || 2 || 3 || 4"
 			}
 		},
-		"wmf": {
+		"node_modules/wmf": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
-			"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
+			"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
+			}
 		},
-		"word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-			"dev": true
+		"node_modules/word-wrap": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"worker-farm": {
+		"node_modules/worker-farm": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
 			"integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"errno": "~0.1.7"
 			}
 		},
-		"wrap-ansi": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-			"integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+		"node_modules/wrap-ansi": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+			"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
 			"dev": true,
-			"requires": {
-				"string-width": "^1.0.1",
-				"strip-ansi": "^3.0.1"
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/wrap-ansi-cjs": {
+			"name": "wrap-ansi",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				}
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi-cjs/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/wrap-ansi-cjs/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/wrap-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"wrappy": {
+		"node_modules/wrap-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-			"dev": true
+			"license": "ISC"
 		},
-		"write": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-			"integrity": "sha512-CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA==",
+		"node_modules/write": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+			"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
 			"dev": true,
-			"optional": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"mkdirp": "^0.5.1"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"ws": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-			"integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+		"node_modules/ws": {
+			"version": "6.2.3",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz",
+			"integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"async-limiter": "~1.0.0"
 			}
 		},
-		"xlsx": {
+		"node_modules/xlsx": {
 			"version": "0.15.6",
 			"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.6.tgz",
 			"integrity": "sha512-7vD9eutyLs65iDjNFimVN+gk/oDkfkCgpQUjdE82QgzJCrBHC4bGPH7fzKVyy0UPp3gyFVQTQEFJaWaAvZCShQ==",
-			"requires": {
+			"license": "Apache-2.0",
+			"dependencies": {
 				"adler-32": "~1.2.0",
 				"cfb": "^1.1.4",
 				"codepage": "~1.14.0",
@@ -18285,205 +24527,291 @@
 				"ssf": "~0.10.3",
 				"wmf": "~1.0.1"
 			},
-			"dependencies": {
-				"commander": {
-					"version": "2.17.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-					"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-				}
+			"bin": {
+				"xlsx": "bin/xlsx.njs"
+			},
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"xml": {
+		"node_modules/xlsx/node_modules/commander": {
+			"version": "2.17.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+			"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+			"license": "MIT"
+		},
+		"node_modules/xml": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
 			"integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
-		"xml-name-validator": {
+		"node_modules/xml-name-validator": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
 			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-			"dev": true
+			"dev": true,
+			"license": "Apache-2.0"
 		},
-		"xmlchars": {
+		"node_modules/xmlchars": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
 			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
-		"xmldoc": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-1.2.0.tgz",
-			"integrity": "sha512-2eN8QhjBsMW2uVj7JHLHkMytpvGHLHxKXBy4J3fAT/HujsEtM6yU84iGjpESYGHg6XwK0Vu4l+KgqQ2dv2cCqg==",
-			"requires": {
+		"node_modules/xmldoc": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-1.3.0.tgz",
+			"integrity": "sha512-y7IRWW6PvEnYQZNZFMRLNJw+p3pezM4nKYPfr15g4OOW9i8VpeydycFuipE2297OvZnh3jSb2pxOt9QpkZUVng==",
+			"license": "MIT",
+			"dependencies": {
 				"sax": "^1.2.4"
 			}
 		},
-		"xtend": {
+		"node_modules/xtend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
 			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-			"dev": true
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.4"
+			}
 		},
-		"y18n": {
+		"node_modules/y18n": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
 			"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-			"dev": true
+			"license": "ISC"
 		},
-		"yallist": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+		"node_modules/yallist": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+			"license": "ISC"
 		},
-		"yargs": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
-			"integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
+		"node_modules/yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
 			"dev": true,
-			"requires": {
-				"cliui": "^4.0.0",
-				"decamelize": "^1.1.1",
-				"find-up": "^2.1.0",
-				"get-caller-file": "^1.0.1",
-				"os-locale": "^3.1.0",
+			"license": "MIT",
+			"dependencies": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
 				"require-directory": "^2.1.1",
-				"require-main-filename": "^1.0.1",
-				"set-blocking": "^2.0.0",
-				"string-width": "^2.0.0",
-				"which-module": "^2.0.0",
-				"y18n": "^3.2.1",
-				"yargs-parser": "^9.0.2"
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs-parser": {
+			"version": "20.2.9",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+			"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
 			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/yargs/node_modules/cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				},
-				"y18n": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-					"integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-					"dev": true
-				}
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
 			}
 		},
-		"yargs-parser": {
-			"version": "9.0.2",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
-			"integrity": "sha512-CswCfdOgCr4MMsT1GzbEJ7Z2uYudWyrGX8Bgh/0eyCzj/DXWdKq6a/ADufkzI1WAOIW6jYaXJvRyLhDO0kfqBw==",
+		"node_modules/yargs/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"camelcase": "^4.1.0"
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
 			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/yargs/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/yargs/node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"camelcase": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-					"integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==",
-					"dev": true
-				}
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/yargs/node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"yauzl": {
+		"node_modules/yauzl": {
 			"version": "2.10.0",
 			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
 			"integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
 			"dev": true,
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"buffer-crc32": "~0.2.3",
 				"fd-slicer": "~1.1.0"
-			},
-			"dependencies": {
-				"fd-slicer": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-					"integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-					"dev": true,
-					"requires": {
-						"pend": "~1.2.0"
-					}
-				}
 			}
 		},
-		"yorkie": {
+		"node_modules/yorkie": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz",
 			"integrity": "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==",
 			"dev": true,
-			"requires": {
+			"hasInstallScript": true,
+			"license": "MIT",
+			"dependencies": {
 				"execa": "^0.8.0",
 				"is-ci": "^1.0.10",
 				"normalize-path": "^1.0.0",
 				"strip-indent": "^2.0.0"
 			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/yorkie/node_modules/ci-info": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+			"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/yorkie/node_modules/cross-spawn": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+			"integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"cross-spawn": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-					"integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^4.0.1",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.8.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
-					"integrity": "sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
-					"dev": true
-				},
-				"normalize-path": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-					"integrity": "sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==",
-					"dev": true
-				}
+				"lru-cache": "^4.0.1",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			}
+		},
+		"node_modules/yorkie/node_modules/execa": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
+			"integrity": "sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cross-spawn": "^5.0.1",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/yorkie/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/yorkie/node_modules/is-ci": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+			"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ci-info": "^1.5.0"
+			},
+			"bin": {
+				"is-ci": "bin.js"
+			}
+		},
+		"node_modules/yorkie/node_modules/lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
 			}
+		},
+		"node_modules/yorkie/node_modules/normalize-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
+			"integrity": "sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/yorkie/node_modules/yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+			"dev": true,
+			"license": "ISC"
 		}
 	}
 }
diff --git a/scadalts-ui/package.json b/scadalts-ui/package.json
index acc6bd6f10..64ea5928c3 100644
--- a/scadalts-ui/package.json
+++ b/scadalts-ui/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "scadalts-ui",
-	"version": "0.5.2",
+	"version": "0.6.0",
 	"tag": "Unknown",
 	"milestone": "Unknown",
 	"build": "1",
@@ -70,10 +70,10 @@
 		"@vue/cli-plugin-eslint": "3.11.0",
 		"@vue/cli-plugin-unit-mocha": "3.11.0",
 		"@vue/cli-service": "4.3.1",
-		"@vue/test-utils": "1.1.4",
+		"@vue/test-utils": "1.3.6",
 		"babel-eslint": "10.0.1",
 		"chai": "4.1.2",
-		"cypress": "4.0.1",
+		"cypress": "13.13.3",
 		"eslint": "5.16.0",
 		"eslint-plugin-vue": "5.0.0",
 		"http-proxy-middleware": "0.20.0",
@@ -85,6 +85,7 @@
 		"vue-cli-plugin-i18n": "1.0.1",
 		"vue-cli-plugin-vuetify": "2.0.8",
 		"vue-template-compiler": "2.6.10",
-		"vuetify-loader": "1.7.2"
+		"vuetify-loader": "1.7.2",
+		"ag-grid-community": "32.2.0"
 	}
 }
diff --git a/scadalts-ui/src/apps/App.vue b/scadalts-ui/src/apps/App.vue
index 1ae8b0b927..9211f0703f 100644
--- a/scadalts-ui/src/apps/App.vue
+++ b/scadalts-ui/src/apps/App.vue
@@ -5,11 +5,29 @@
 		<v-app-bar id="topbar" app dark color="primary">
 			<v-list-item>
 				<v-list-item-content>
-					<v-list-item-title class="title"> Scada-LTS
-						<v-icon  v-if="!wsLive" title="Offline">mdi-access-point-network-off</v-icon></v-list-item-title>
-					<v-list-item-subtitle>
-						version {{ $store.getters.appMilestone }}
-					</v-list-item-subtitle>
+					<v-row class="no-wrap">
+						<v-col cols="auto">
+							<v-list-item-title class="title">Scada-LTS
+								<v-icon v-if="!wsLive" title="Offline">mdi-access-point-network-off</v-icon>
+							</v-list-item-title>
+							<v-list-item-subtitle>
+								version {{ $store.getters.appMilestone }}
+							</v-list-item-subtitle>
+						</v-col>
+
+						<v-row>
+							<v-col class="d-flex justify-start align-center">
+								<div id="top-description-container" class="text-align-left">
+									<span id="top-description-prefix" class="custom-text">
+										{{ topDescriptionPrefix }}
+									</span>
+									<span id="top-description" class="custom-text">
+										{{ topDescription }}
+									</span>
+								</div>
+							</v-col>
+						</v-row>
+					</v-row>
 				</v-list-item-content>
 			</v-list-item>
 			<v-list-item max-width="50" v-if="!!highestUnsilencedAlarmLevel">
@@ -71,6 +89,7 @@
 import NavigationBar from '../layout/NavigationBar.vue';
 import internetMixin from '@/utils/connection-status-utils';
 import NotificationAlert from '../layout/snackbars/NotificationAlert.vue';
+import {unescapeHtml} from "@/utils/common";
 
 export default {
 	name: 'app',
@@ -104,17 +123,17 @@ export default {
 				4: {
 					image: "images/flag_red.png"
 				}
-			},
+			}
 		};
 	},
 
 	computed: {
 		user() {
-			return this.$store.state.loggedUser;
+			return this.$store.getters.loggedUser;
 		},
 		isUserRoleAdmin() {
-			if (!!this.$store.state.loggedUser) {
-				return this.$store.state.loggedUser.admin;
+			if (!!this.$store.getters.loggedUser) {
+				return this.$store.getters.loggedUser.admin;
 			} else {
 				return false;
 			}
@@ -128,14 +147,31 @@ export default {
 		isLoginPage() {
 			return this.$route.name === 'login';
 		},
+		topDescriptionPrefix() {
+		    let systemInfoSettings = this.$store.state.systemSettings.systemInfoSettings;
+		    if(systemInfoSettings && systemInfoSettings.topDescriptionPrefix) {
+		        return systemInfoSettings.topDescriptionPrefix;
+		    }
+		    return '';
+		},
+        topDescription() {
+            let systemInfoSettings = this.$store.state.systemSettings.systemInfoSettings;
+            if(systemInfoSettings && systemInfoSettings.topDescription) {
+		        return systemInfoSettings.topDescription;
+		    }
+            return '';
+        }
 	},
 
-	mounted() {
+	async mounted() {
 	    if(!this.user) {
-    			this.$store.dispatch('getUserInfo');
-    	}
-		this.$store.dispatch('getLocaleInfo');
+            await this.$store.dispatch('getUserInfo');
+        }
+        await this.$store.dispatch('getLocaleInfo');
+        await this.$store.dispatch('getCustomCss');
+        await this.$store.dispatch('getSystemInfoSettings');
 		this.connectToWebSocket();
+		this.fetchCustomCss();
 	},
 
 	destroyed() {
@@ -143,6 +179,26 @@ export default {
 	},
 
 	methods: {
+
+		fetchCustomCss() {
+			let customCss = this.$store.state.systemSettings.customCss;
+			let unescapedContent = unescapeHtml(customCss.content);
+            this.applyCustomCss(unescapedContent);
+		},
+
+		applyCustomCss(cssContent) {
+			let styleElement = document.getElementById('custom-css-style');
+
+			if (!styleElement) {
+				styleElement = document.createElement('style');
+				styleElement.id = 'custom-css-style';
+				styleElement.type = 'text/css';
+				document.head.appendChild(styleElement);
+			}
+			styleElement.innerHTML = '';
+			styleElement.appendChild(document.createTextNode(cssContent));
+		},
+
 		subscribeForAlarms() {
 			this.wsConnectionRetires = 5;
 			let stompClient = this.$store.state.webSocketModule.webSocket;
diff --git a/scadalts-ui/src/components/SynopticPanel/slts/State.vue b/scadalts-ui/src/components/SynopticPanel/slts/State.vue
index 53d51d6455..08f450bf66 100644
--- a/scadalts-ui/src/components/SynopticPanel/slts/State.vue
+++ b/scadalts-ui/src/components/SynopticPanel/slts/State.vue
@@ -133,8 +133,13 @@ export default {
 
 		onPointEnabledUpdate(enabled) {
             if(enabled) {
-                this.changeComponentText(`${this.componentId}_value`, this.lastValue);
-                this.changeComponentColor(`${this.componentId}`, this.enabledColor);
+                if(this.lastValue){
+                    this.onPointValueUpdate(this.lastValue)
+                }else{
+                    // Point does not have any data
+                    this.changeComponentText(`${this.componentId}_value`, "N/A");
+                    this.changeComponentColor(`${this.componentId}`, this.enabledColor);
+                }
             } else {
                 this.changeComponentText(`${this.componentId}_value`, "N/A");
                 this.changeComponentColor(`${this.componentId}`, "#d6d5d5");
diff --git a/scadalts-ui/src/components/SynopticPanel/slts/WaterLevel.vue b/scadalts-ui/src/components/SynopticPanel/slts/WaterLevel.vue
index 529bc4023c..b69fdb9247 100644
--- a/scadalts-ui/src/components/SynopticPanel/slts/WaterLevel.vue
+++ b/scadalts-ui/src/components/SynopticPanel/slts/WaterLevel.vue
@@ -10,15 +10,18 @@
 					<v-text-field disabled v-model="componentData.data.pointXid" label="Point Xid" />
 				</v-col>
 
-				<v-col cols="12" md="4">
+				<v-col cols="12" md="3">
 					<v-text-field v-model="componentData.data.label" label="Label:" />
 				</v-col>
-				<v-col cols="12" md="4">
+				<v-col cols="12" md="3">
 					<v-text-field v-model="componentData.data.minval" label="Min value:" />
 				</v-col>
-				<v-col cols="12" md="4">
+				<v-col cols="12" md="3">
 					<v-text-field v-model="componentData.data.maxval" label="Max value:" />
 				</v-col>
+				<v-col cols="12" md="3">
+					<v-text-field v-model="componentData.data.decimals" label="Percent Decimal:" />
+				</v-col>
 			</v-row>
 		</v-container>
 	</div>
@@ -70,6 +73,10 @@ export default {
 			let hightValue = maxVal - value;
 			if (minVal === undefined || minVal === null) minVal = 0;
 			let waterLevel = ((hightValue * maxHeight) / (maxVal - minVal));
+
+			const decimals = this.componentData.data.decimals ? this.componentData.data.decimals : 0
+			this.changeComponentText(`${this.componentId}_absolute`, value);
+			this.changeComponentText(`${this.componentId}_percentage`, ((value * 100) / (maxVal - minVal)).toFixed(decimals));
 			this.$svg.get(`${this.componentId}_background`).animate().height(waterLevel);
 		},
 	},
diff --git a/scadalts-ui/src/components/datasources/DataPointCreation.vue b/scadalts-ui/src/components/datasources/DataPointCreation.vue
index a555ef9cba..b20362100c 100644
--- a/scadalts-ui/src/components/datasources/DataPointCreation.vue
+++ b/scadalts-ui/src/components/datasources/DataPointCreation.vue
@@ -6,8 +6,7 @@
 					<h1>
 						<span v-if="creator"> Create </span>
 						<span v-else> Update </span>
-						<span>
-							{{ title }}
+						<span v-html="title">
 						</span>
 					</h1>
 				</v-col>
@@ -23,7 +22,7 @@
 					<v-col cols="12" :sm="6">
 						<v-text-field
 							autofocus
-							v-model="datapoint.name"
+							v-model="datapoint.tempName"
 							label="Data Point Name"
 							:rules="[ruleNotNull]"
 							required
@@ -31,7 +30,7 @@
 					</v-col>
 					<v-col cols="6" :sm="4">
 						<v-text-field
-							v-model="datapoint.xid"
+							v-model="datapoint.tempXid"
 							label="Data Point Export ID"
 							@input="checkXidUnique"
 							:rules="[ruleNotNull, ruleXidUnique]"
@@ -47,7 +46,7 @@
 					</v-col>
 					<v-col cols="12">
 						<v-text-field
-							v-model="datapoint.description"
+							v-model="datapoint.tempDescription"
 							label="Description"
 						></v-text-field>
 					</v-col>
@@ -99,6 +98,9 @@ export default {
 
 	async mounted(){
 		this.initialState = JSON.parse(JSON.stringify(this.datapoint));
+		this.datapoint.tempName = this.datapoint.name;
+        this.datapoint.tempXid = this.datapoint.xid;
+        this.datapoint.tempDescription = this.datapoint.description;
 	},
 
 	data() {
@@ -107,7 +109,7 @@ export default {
 			formValid: false,
 			xidUnique: true,
 			ruleNotNull: (v) => !!v || this.$t('validation.rule.notNull'),
-			ruleXidUnique: () => this.xidUnique || this.$t('validation.rule.xid.notUnique'),
+			ruleXidUnique: () => this.xidUnique || this.$t('validation.rule.xid.notUnique')
 		};
 	},
 
@@ -123,9 +125,14 @@ export default {
 		},
 
 		accept() {
+            let datapoint = JSON.parse(JSON.stringify(this.datapoint));
+            datapoint.name = this.datapoint.tempName;
+            datapoint.xid = this.datapoint.tempXid;
+            datapoint.description = this.datapoint.tempDescription;
+
 			console.debug('datasources.DataPointCreation.vue::accept()');
 			if (this.formValid) {
-				this.$emit('accept');
+				this.$emit('accept', datapoint);
 			}
 		},
 
diff --git a/scadalts-ui/src/components/datasources/DataSourceConfig.vue b/scadalts-ui/src/components/datasources/DataSourceConfig.vue
index 4b5e7371e9..9f865250ee 100644
--- a/scadalts-ui/src/components/datasources/DataSourceConfig.vue
+++ b/scadalts-ui/src/components/datasources/DataSourceConfig.vue
@@ -6,9 +6,7 @@
 					<h1>
 						<span v-if="creator"> Create </span>
 						<span v-else> Update </span>
-						<span>
-							{{ title }}
-						</span>
+						<span v-html="title"> </span>
 					</h1>
 				</v-col>
 				<v-col cols="4">
@@ -23,7 +21,7 @@
 					<v-col cols="12" :md="8" :sm="12" id="datasource-config--name">
 						<v-text-field
 							autofocus
-							v-model="datasource.name"
+							v-model="datasource.tempName"
 							label="DataSource Name"
 							:rules="[ruleNotNull]"
 							required
@@ -31,7 +29,7 @@
 					</v-col>
 					<v-col cols="12" :md="4" :sm="12" id="datasource-config--xid">
 						<v-text-field
-							v-model="datasource.xid"
+							v-model="datasource.tempXid"
 							label="DataSource Export Id"
 							@input="checkXidUnique"
 							:rules="[ruleNotNull, ruleXidUnique]"
@@ -127,8 +125,12 @@ export default {
 	mounted() {
 		if (this.creator) {
 			this.$store.dispatch('getUniqueDataSourceXid').then((resp) => {
-				this.datasource.xid = resp;
+				this.datasource.tempXid = resp;
+				this.datasource = JSON.parse(JSON.stringify(this.datasource));
 			});
+		} else {
+            this.datasource.tempName = this.datasource.name;
+            this.datasource.tempXid = this.datasource.xid;
 		}
 	},
 
@@ -138,7 +140,7 @@ export default {
 			xidUnique: true,
 			ruleNotNull: (v) => !!v || this.$t('validation.rule.notNull'),
 			ruleOnlyNumber: (v) => !isNaN(v) || this.$t('validation.rule.onlyNumber'),
-			ruleXidUnique: () => this.xidUnique || this.$t('validation.rule.xid.notUnique'),
+			ruleXidUnique: () => this.xidUnique || this.$t('validation.rule.xid.notUnique')
 		};
 	},
 
@@ -149,8 +151,12 @@ export default {
 		},
 
 		accept() {
-			console.debug('datasources.DataSourceConfig.vue::accept()');
-			this.$emit('accept');
+		    let datasource = JSON.parse(JSON.stringify(this.datasource));
+        	datasource.name = this.datasource.tempName;
+        	datasource.xid = this.datasource.tempXid;
+
+        	console.debug('datasources.DataSourceConfig.vue::accept()');
+			this.$emit('accept', datasource);
 		},
 
 		onUpdatePeriodTypeUpdate(value) {
@@ -162,14 +168,14 @@ export default {
 				this.datasource.id = this.datasource.id || -1;
 				let resp = await this.$store.dispatch(
 					'requestGet',
-					`/datasource/validate?xid=${this.datasource.xid}&id=${this.datasource.id}`,
+					`/datasource/validate?xid=${this.datasource.tempXid}&id=${this.datasource.id}`,
 				);
 				this.xidUnique = resp.unique;
 				this.$refs.datasourceForm.validate();
 			} catch (e) {
 				console.error('Failed to fetch data');
 			}
-		},
+		}
 	},
 };
 </script>
diff --git a/scadalts-ui/src/components/datasources/DataSourceConfigMixin.js b/scadalts-ui/src/components/datasources/DataSourceConfigMixin.js
index c9152bf7ee..06e6c4a412 100644
--- a/scadalts-ui/src/components/datasources/DataSourceConfigMixin.js
+++ b/scadalts-ui/src/components/datasources/DataSourceConfigMixin.js
@@ -60,7 +60,8 @@ export const dataSourceConfigMixin = {
         generateUniqueXid() {
             if (this.createMode) {
                 this.$store.dispatch('getUniqueDataSourceXid').then(resp => {
-                    this.datasource.xid = resp;
+                    this.datasource.tempXid = resp;
+                    this.datasource = JSON.parse(JSON.stringify(this.datasource));
                 });
             }
         },
@@ -69,8 +70,8 @@ export const dataSourceConfigMixin = {
             this.$emit('canceled');
         },
 
-        save() {
-            this.$emit('saved', this.datasource);
+        save(data) {
+            this.$emit('saved', data);
         },
     },
 }
diff --git a/scadalts-ui/src/components/datasources/MetaDataSource/config.vue b/scadalts-ui/src/components/datasources/MetaDataSource/config.vue
index f1ddebf188..95421a9d23 100644
--- a/scadalts-ui/src/components/datasources/MetaDataSource/config.vue
+++ b/scadalts-ui/src/components/datasources/MetaDataSource/config.vue
@@ -6,7 +6,7 @@
 		:creator="createMode"
 		availablePeriodTypes="1,2,3,8,9,11,26,27"
 		@cancel="cancel()"
-		@accept="save()"
+		@accept="save"
 	>
 		<template v-slot:selector>
 			<slot name="selector"></slot>
diff --git a/scadalts-ui/src/components/datasources/MetaDataSource/index.vue b/scadalts-ui/src/components/datasources/MetaDataSource/index.vue
index d2474a8355..2a45fafae2 100644
--- a/scadalts-ui/src/components/datasources/MetaDataSource/index.vue
+++ b/scadalts-ui/src/components/datasources/MetaDataSource/index.vue
@@ -4,7 +4,7 @@
 			<config
 				v-if="detailsLoaded"
 				@canceled="closeEditor()"
-				@saved="onSaved($event)"
+				@saved="onSaved"
 				:datasource="ds"
 				:createMode="false"
 			/>
diff --git a/scadalts-ui/src/components/datasources/MetaDataSource/point.vue b/scadalts-ui/src/components/datasources/MetaDataSource/point.vue
index 9d5a6af87b..0c8e2d4f00 100644
--- a/scadalts-ui/src/components/datasources/MetaDataSource/point.vue
+++ b/scadalts-ui/src/components/datasources/MetaDataSource/point.vue
@@ -5,7 +5,7 @@
 			:creator="createMode"
 			:datapoint="datapoint"
 			@cancel="cancel()"
-			@accept="save()"
+			@accept="save"
 		>
 			<template v-slot:selector>
 				<v-select
@@ -537,11 +537,11 @@ export default {
 			this.$emit('canceled');
 		},
 
-		async save() {
+		async save(data) {
 			console.debug('VirtualDataSource.point.vue::save()');
 			await this.validateScript();
 			if (this.validScript)
-				this.$emit('saved', this.datapoint);
+				this.$emit('saved', data);
 		},
 
 		addMsValue(array) {
diff --git a/scadalts-ui/src/components/datasources/ModBusIpDataSource/config.vue b/scadalts-ui/src/components/datasources/ModBusIpDataSource/config.vue
index 8329cc434c..635e5f8c45 100644
--- a/scadalts-ui/src/components/datasources/ModBusIpDataSource/config.vue
+++ b/scadalts-ui/src/components/datasources/ModBusIpDataSource/config.vue
@@ -5,7 +5,7 @@
 		:creator="createMode"
 		availablePeriodTypes="1,2,3,8"
 		@cancel="cancel()"
-		@accept="save()"
+		@accept="save"
 	>
 		<template v-slot:selector>
 			<slot name="selector"></slot>
diff --git a/scadalts-ui/src/components/datasources/ModBusIpDataSource/index.vue b/scadalts-ui/src/components/datasources/ModBusIpDataSource/index.vue
index b8924b4926..eaa3f68648 100644
--- a/scadalts-ui/src/components/datasources/ModBusIpDataSource/index.vue
+++ b/scadalts-ui/src/components/datasources/ModBusIpDataSource/index.vue
@@ -4,7 +4,7 @@
 			<config
 				v-if="detailsLoaded"
 				@canceled="closeEditor()"
-				@saved="onSaved($event)"
+				@saved="onSaved"
 				:datasource="ds"
 				:createMode="false"
 			/>
diff --git a/scadalts-ui/src/components/datasources/ModBusIpDataSource/point.vue b/scadalts-ui/src/components/datasources/ModBusIpDataSource/point.vue
index 93fa2b8dbd..69ab2fb524 100644
--- a/scadalts-ui/src/components/datasources/ModBusIpDataSource/point.vue
+++ b/scadalts-ui/src/components/datasources/ModBusIpDataSource/point.vue
@@ -7,7 +7,7 @@
 			:datapoint="datapoint"
 			:settableDisabled="settingsInputDisabled"
 			@cancel="cancel()"
-			@accept="save()"
+			@accept="save"
 		>
 			<template v-slot:selector>
 				<v-select
@@ -317,9 +317,9 @@ export default {
 			this.$emit('canceled');
 		},
 
-		save() {
+		save(data) {
 			console.debug('VirtualDataSource.point.vue::save()');
-			this.$emit('saved', this.datapoint);
+			this.$emit('saved', data);
 		},
 
 		changeRegisterRange() {
diff --git a/scadalts-ui/src/components/datasources/SnmpDataSource/config.vue b/scadalts-ui/src/components/datasources/SnmpDataSource/config.vue
index 10dbc43176..db7e89d482 100644
--- a/scadalts-ui/src/components/datasources/SnmpDataSource/config.vue
+++ b/scadalts-ui/src/components/datasources/SnmpDataSource/config.vue
@@ -4,7 +4,7 @@
 		:datasource="datasource"
 		:creator="createMode"
 		@cancel="cancel()"
-		@accept="save()"
+		@accept="save"
 	>
 		<template v-slot:selector>
 			<slot name="selector"></slot>
diff --git a/scadalts-ui/src/components/datasources/SnmpDataSource/index.vue b/scadalts-ui/src/components/datasources/SnmpDataSource/index.vue
index 8ef2c14f91..a4a74781bd 100644
--- a/scadalts-ui/src/components/datasources/SnmpDataSource/index.vue
+++ b/scadalts-ui/src/components/datasources/SnmpDataSource/index.vue
@@ -4,7 +4,7 @@
 			<config
 				v-if="detailsLoaded"
 				@canceled="closeEditor()"
-				@saved="onSaved($event)"
+				@saved="onSaved"
 				:datasource="ds"
 				:createMode="false"
 			/>
diff --git a/scadalts-ui/src/components/datasources/SnmpDataSource/point.vue b/scadalts-ui/src/components/datasources/SnmpDataSource/point.vue
index a85b8e3b1d..0cf5748edc 100644
--- a/scadalts-ui/src/components/datasources/SnmpDataSource/point.vue
+++ b/scadalts-ui/src/components/datasources/SnmpDataSource/point.vue
@@ -5,7 +5,7 @@
 			:creator="createMode"
 			:datapoint="datapoint"
 			@cancel="cancel()"
-			@accept="save()"
+			@accept="save"
 		>
 			<template v-slot:selector>
 				<v-select
@@ -142,8 +142,8 @@ export default {
 			this.$emit('canceled');
 		},
 
-		save() {
-			this.$emit('saved', this.datapoint);
+		save(data) {
+			this.$emit('saved', data);
 		},
 	},
 };
diff --git a/scadalts-ui/src/components/datasources/VirtualDataSource/config.vue b/scadalts-ui/src/components/datasources/VirtualDataSource/config.vue
index 3cbd6a8a61..84df490c8b 100644
--- a/scadalts-ui/src/components/datasources/VirtualDataSource/config.vue
+++ b/scadalts-ui/src/components/datasources/VirtualDataSource/config.vue
@@ -5,7 +5,7 @@
 		:creator="createMode"
 		availablePeriodTypes="1,2,3,8"
 		@cancel="cancel()"
-		@accept="save()"
+		@accept="save"
 	>
 		<template v-slot:selector>
 			<slot name="selector"></slot>
diff --git a/scadalts-ui/src/components/datasources/VirtualDataSource/index.vue b/scadalts-ui/src/components/datasources/VirtualDataSource/index.vue
index d2474a8355..2a45fafae2 100644
--- a/scadalts-ui/src/components/datasources/VirtualDataSource/index.vue
+++ b/scadalts-ui/src/components/datasources/VirtualDataSource/index.vue
@@ -4,7 +4,7 @@
 			<config
 				v-if="detailsLoaded"
 				@canceled="closeEditor()"
-				@saved="onSaved($event)"
+				@saved="onSaved"
 				:datasource="ds"
 				:createMode="false"
 			/>
diff --git a/scadalts-ui/src/components/datasources/VirtualDataSource/point.vue b/scadalts-ui/src/components/datasources/VirtualDataSource/point.vue
index 002f9f7d8e..8168b849bc 100644
--- a/scadalts-ui/src/components/datasources/VirtualDataSource/point.vue
+++ b/scadalts-ui/src/components/datasources/VirtualDataSource/point.vue
@@ -5,13 +5,13 @@
 			:creator="createMode"
 			:datapoint="datapoint"
 			@cancel="cancel()"
-			@accept="save()"
+			@accept="save"
 		>
 			<template v-slot:selector>
 				<v-select
 					v-model="datapoint.pointLocator.dataTypeId"
 					:items="datapointTypes"
-          @change="resetPointLocatorToDefault"
+                    @change="resetPointLocatorToDefault"
 				></v-select>
 			</template>
 
@@ -38,7 +38,7 @@
 								label="Start Value"
 								v-model="datapoint.pointLocator.alternateBooleanChange.startValue"
 								:items="booleanSelectBox"
-                :rules = "ruleSelectNotNull"
+                                :rules = "ruleNotNull"
 							></v-select>
 						</v-col>
 					</v-row>
@@ -50,7 +50,7 @@
 								label="Start Value"
 								v-model="datapoint.pointLocator.randomBooleanChange.startValue"
 								:items="booleanSelectBox"
-                :rules = "ruleSelectNotNull"
+                                :rules = "ruleNotNull"
 							></v-select>
 						</v-col>
 					</v-row>
@@ -60,8 +60,8 @@
 								label="Start Value"
 								v-model="datapoint.pointLocator.noChange.startValue"
 								:items="booleanSelectBox"
-                :rules = "ruleSelectNotNull"
-                required
+                                :rules = "ruleNotNull"
+                                required
 							></v-select>
 						</v-col>
 					</v-row>
@@ -97,7 +97,7 @@
 								label="Initail Value"
 								v-model="datapoint.pointLocator.incrementMultistateChange.startValue"
 								:items="datapoint.pointLocator.incrementMultistateChange.values"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-select>
 						</v-col>
 						<v-col
@@ -145,7 +145,7 @@
 								label="Initail Value"
 								v-model="datapoint.pointLocator.randomMultistateChange.startValue"
 								:items="datapoint.pointLocator.randomMultistateChange.values"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-select>
 						</v-col>
 						<v-col
@@ -171,7 +171,7 @@
 								label="Start Value"
 								type="number"
 								v-model="datapoint.pointLocator.noChange.startValue"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 					</v-row>
@@ -194,7 +194,7 @@
 								type="Number"
 								label="Maximum"
 								v-model="datapoint.pointLocator.brownianChange.max"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 						<v-col>
@@ -202,7 +202,7 @@
 								type="Number"
 								label="Maximum Change"
 								v-model="datapoint.pointLocator.brownianChange.maxChange"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 						<v-col>
@@ -210,7 +210,7 @@
 								type="Number"
 								label="Start value"
 								v-model="datapoint.pointLocator.brownianChange.startValue"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 					</v-row>
@@ -232,7 +232,7 @@
 								type="Number"
 								label="Maximum"
 								v-model="datapoint.pointLocator.incrementAnalogChange.max"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 						<v-col>
@@ -240,7 +240,7 @@
 								type="Number"
 								label="Maximum Change"
 								v-model="datapoint.pointLocator.incrementAnalogChange.change"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 						<v-col>
@@ -254,7 +254,7 @@
 								type="Number"
 								label="Start value"
 								v-model="datapoint.pointLocator.incrementAnalogChange.startValue"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 					</v-row>
@@ -265,7 +265,7 @@
 								type="Number"
 								label="Start value"
 								v-model="datapoint.pointLocator.noChange.startValue"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 					</v-row>
@@ -292,7 +292,7 @@
 								type="Number"
 								label="Start value"
 								v-model="datapoint.pointLocator.randomAnalogChange.startValue"
-								:rules="[ruleNotNull]"
+								:rules="ruleNotNull"
 							></v-text-field>
 							<!-- TODO: Add rule for not null -->
 						</v-col>
@@ -309,7 +309,7 @@
 								type="Number"
 								label="Attraction Point ID"
 								v-model="datapoint.pointLocator.analogAttractorChange.attractionPointId"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 						<v-col>
@@ -317,7 +317,7 @@
 								type="Number"
 								label="volatility"
 								v-model="datapoint.pointLocator.analogAttractorChange.volatility"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 						<v-col>
@@ -325,7 +325,7 @@
 								type="Number"
 								label="maxChange"
 								v-model="datapoint.pointLocator.analogAttractorChange.maxChange"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 						<v-col>
@@ -333,7 +333,7 @@
 								type="Number"
 								label="Start value"
 								v-model="datapoint.pointLocator.analogAttractorChange.startValue"
-                :rules="[ruleNotNull]"
+                                :rules="ruleNotNull"
 							></v-text-field>
 						</v-col>
 					</v-row>
@@ -346,7 +346,7 @@
 					<v-text-field
 						label="Initial Value"
 						v-model="datapoint.pointLocator.noChange.startValue"
-            :rules="[ruleNotNull]"
+                        :rules="ruleNotNull"
 					></v-text-field>
 				</v-col>
 			</v-row>
@@ -393,7 +393,7 @@ export default {
 					value: true,
 				},
 			],
-			ruleNotNull: (v) => !!v || this.$t('validation.rule.notNull'),
+			ruleNotNull: (v) => !!v || this.$t('validation.rule.notNull')
 		};
 	},
 
@@ -415,11 +415,7 @@ export default {
 
 		datapointTypes() {
 			return this.$store.state.dataSourceState.datapointTypes;
-		},
-
-    ruleSelectNotNull: function() {
-      return [v => !!v || this.$t('validation.rule.notNull')]
-    },
+		}
 	},
 
 	methods: {
@@ -428,9 +424,9 @@ export default {
 			this.$emit('canceled');
 		},
 
-		save() {
+		save(data) {
 			console.debug('VirtualDataSource.point.vue::save()');
-			this.$emit('saved', this.datapoint);
+			this.$emit('saved', data);
 		},
 
 		addMsValue(array) {
@@ -453,11 +449,11 @@ export default {
 			}
 		},
 
-    resetPointLocatorToDefault() {
-      var oldValue = this.datapoint.pointLocator.dataTypeId;
-      this.datapoint.pointLocator = new ScadaVirtualDataPoint().pointLocator;
-      this.datapoint.pointLocator.dataTypeId = oldValue;
-    },
+        resetPointLocatorToDefault() {
+            var oldValue = this.datapoint.pointLocator.dataTypeId;
+            this.datapoint.pointLocator = new ScadaVirtualDataPoint().pointLocator;
+            this.datapoint.pointLocator.dataTypeId = oldValue;
+        },
   },
 };
 </script>
diff --git a/scadalts-ui/src/layout/buttons/DataPointSearchComponent.vue b/scadalts-ui/src/layout/buttons/DataPointSearchComponent.vue
index 6c96817b95..b34151c302 100644
--- a/scadalts-ui/src/layout/buttons/DataPointSearchComponent.vue
+++ b/scadalts-ui/src/layout/buttons/DataPointSearchComponent.vue
@@ -7,7 +7,7 @@
 		cache-items
 		hide-no-data
 		hide-details
-		item-text="name"
+		item-text="extendName"
 		item-value="xid"
 		:label="`${$t('datapoint.search.label')}: ${value}`"
 		:placeholder="`${$t('datapoint.search.placeholder')}`"
@@ -15,6 +15,9 @@
 		prepend-icon="mdi-magnify"
 		@change="emit()"
 	>
+         <template v-slot:item="data">
+            <span v-html="data.item.extendName"></span>
+         </template>
 	</v-autocomplete>
 </template>
 <script>
diff --git a/scadalts-ui/src/layout/dialogs/ConfirmationDialog.vue b/scadalts-ui/src/layout/dialogs/ConfirmationDialog.vue
index e64d29c346..480621a778 100644
--- a/scadalts-ui/src/layout/dialogs/ConfirmationDialog.vue
+++ b/scadalts-ui/src/layout/dialogs/ConfirmationDialog.vue
@@ -5,10 +5,10 @@
 		</template>
 		<v-card class="dialog-confirmation">
 			<v-card-title class="headline">
-				{{ title }}
+				<span v-html="title"></span>
 			</v-card-title>
 			<v-card-text>
-				{{ message }}
+				<span v-html="message"></span>
 			</v-card-text>
 			<v-card-actions>
 				<v-spacer></v-spacer>
diff --git a/scadalts-ui/src/layout/dialogs/ConfirmationDialogV2.vue b/scadalts-ui/src/layout/dialogs/ConfirmationDialogV2.vue
index 909db099ff..711d4dc446 100644
--- a/scadalts-ui/src/layout/dialogs/ConfirmationDialogV2.vue
+++ b/scadalts-ui/src/layout/dialogs/ConfirmationDialogV2.vue
@@ -5,10 +5,10 @@
 		</template>
 		<v-card class="dialog-confirmation">
 			<v-card-title class="headline">
-				{{ title }}
+				<span v-html="title"></span>
 			</v-card-title>
 			<v-card-text>
-				{{ message }}
+				<span v-html="message"></span>
 			</v-card-text>
 			<v-card-actions>
 				<v-spacer></v-spacer>
diff --git a/scadalts-ui/src/layout/lists/events/EventScadaItem.vue b/scadalts-ui/src/layout/lists/events/EventScadaItem.vue
index 3e3bff8a14..39ba32f63c 100644
--- a/scadalts-ui/src/layout/lists/events/EventScadaItem.vue
+++ b/scadalts-ui/src/layout/lists/events/EventScadaItem.vue
@@ -95,10 +95,10 @@
 							</v-list-item-icon>
 							<v-list-item-content>
 								<v-list-item-title>
-									{{ comment.comment }}
+								    <span v-html="comment.comment"></span>
 								</v-list-item-title>
 								<v-list-item-subtitle>
-									{{ comment.username }},
+								    <span v-html="comment.username"></span>,
 									{{ new Date(comment.ts).toLocaleString() }}
 								</v-list-item-subtitle>
 							</v-list-item-content>
@@ -157,7 +157,7 @@ export default {
 	},
 
 	methods: {
-		addComment(e) {
+		async addComment(e) {
 			let time = new Date();
 			let comment = {
 				userId: this.$store.state.loggedUser.id,
@@ -166,13 +166,13 @@ export default {
 				username: this.$store.state.loggedUser.username,
 				prettyTime: time.toLocaleTimeString(),
 			};
-			e.userComments.push(Object.assign({}, comment));
-			this.$store.dispatch('addUserComment', {
+			let response = this.$store.dispatch('addUserComment', {
 				comment: comment,
 				typeId: 1,
 				refId: e.id,
 			});
 			this.newComment = '';
+			e.userComments.push(Object.assign({}, response));
 		},
 
 		deleteComment(e, comment) {
diff --git a/scadalts-ui/src/locales/en.json b/scadalts-ui/src/locales/en.json
index 56788968b0..313bdf0c28 100644
--- a/scadalts-ui/src/locales/en.json
+++ b/scadalts-ui/src/locales/en.json
@@ -1048,8 +1048,8 @@
 	"systemsettings.misc.dataPointRuntimeValueSynchronized.partial": "Partial",
 	"systemsettings.misc.dataPointRuntimeValueSynchronized.none": "None",
 	"systemsettings.http.response.headers": "HTTP response headers",
-	"systemsettings.view.forceFullScreen": "Force full screen mode",
-	"systemsettings.view.hideShortcutDisableFullScreen": "Hide shortcut to disable full screen",
+	"systemsettings.misc.viewForceFullScreenEnabled": "Force full screen mode",
+	"systemsettings.misc.viewHideShortcutDisableFullScreenEnabled": "Hide shortcut to disable full screen",
 	"userDetails.view.forceAdminTitle": "The function is enforced by the Admin",
 	"userDetails.view.enableFullScreen": "Enable full screen mode",
 	"userDetails.view.hideShortcutDisableFullScreen": "Hide shortcut to disable full screen",
@@ -1063,5 +1063,19 @@
 	"systemsettings.webresource.uploads.path": "Uploaded images save path",
 	"systemsettings.webresource.graphics.path": "Custom Graphics images path",
 	"systemsettings.webresource.uploads.path.wrong":"Uploaded images save path must end with 'uploads' or 'uploads{0}' ",
-	"systemsettings.webresource.graphics.path.wrong": "Custom Graphics images path must end with 'graphics' or 'graphics{0}' "
+	"systemsettings.webresource.graphics.path.wrong": "Custom Graphics images path must end with 'graphics' or 'graphics{0}' ",
+	"systemsettings.misc.eventAssignEnabled": "Event Assign enabled",
+	"systemsettings.misc.eventPendingCacheEnabled": "Event Pending Cache Enabled",
+	"systemsettings.misc.eventPendingLimit": "Event Pending Limit",
+	"systemsettings.misc.workItemsReportingEnabled": "Work Items Reporting Enabled",
+	"systemsettings.misc.workItemsReportingItemsPerSecondEnabled": "Items Per Second Reporting Enabled",
+	"systemsettings.misc.workItemsReportingItemsPerSecondLimit": "Items Per Second Reporting Limit",
+	"systemsettings.misc.threadsNameAdditionalLength": "Thread Name Length",
+	"systemsettings.misc.webResourceUploadsPath": "Uploads Images Path",
+	"systemsettings.misc.webResourceGraphicsPath": "Graphics Images Path",
+	"systemsettings.misc.webResourceUploadsPath.wrong":"Uploaded images save path must end with 'uploads' or 'uploads{0}' ",
+	"systemsettings.misc.webResourceGraphicsPath.wrong": "Graphics images path must end with 'graphics' or 'graphics{0}' ",
+	"systemsettings.top.description": "Top description",
+	"systemsettings.top.description.prefix": "Top description prefix",
+	"event.list.reloadPage": "Reload the page"
 }
diff --git a/scadalts-ui/src/store/dataSource/index.js b/scadalts-ui/src/store/dataSource/index.js
index edf6e9a6b2..d8060818cf 100644
--- a/scadalts-ui/src/store/dataSource/index.js
+++ b/scadalts-ui/src/store/dataSource/index.js
@@ -310,10 +310,14 @@ const ds = {
 					url: `/datapoint`,
 					data: dataPoint,
 				}).then(response => {
-					console.log(response);
-					resolve();
-					// commit('UPDATE_DATA_SOURCE',response);
-					// resolve(response);
+					let dataSourceId = response.dataSourceId;
+					let dataPointXid = response.xid;
+					commit("REMOVE_DATA_POINT_IN_DS", {dataSourceId, dataPointXid});
+				    commit('ADD_DATA_POINT_IN_DS', {
+                        dataSourceId: dataSourceId,
+                        dataPoint: response
+                    });
+                    resolve();
 				}).catch(error => {
 					console.error(error);
 					reject();
diff --git a/scadalts-ui/src/store/events/index.js b/scadalts-ui/src/store/events/index.js
index af35434369..f923131899 100644
--- a/scadalts-ui/src/store/events/index.js
+++ b/scadalts-ui/src/store/events/index.js
@@ -38,7 +38,11 @@ const storeEvents = {
     },
 
 		getCommentsByEventId({ dispatch }, id) {
-			return dispatch('requestGet', `/events/${id}/comments`);
+			return dispatch('requestGet', `/events/${id}/comments`)
+			.catch(error => {
+				console.error("API error:", error);
+				throw error;
+			});
 		},
 
 		fetchDataPointEvents({ dispatch }, payload) {
@@ -65,6 +69,10 @@ const storeEvents = {
 			return dispatch('requestPut', {
 				url: `/events/ack/${payload.eventId}`,
 				data: payload,
+			})
+			.catch(error => {
+				console.error("API error during event acknowledgement:", error);
+				throw error;
 			});
 		},
 		silenceEvent({ dispatch }, payload) {
diff --git a/scadalts-ui/src/store/index.js b/scadalts-ui/src/store/index.js
index 0774a26d13..ca72dc8cd9 100644
--- a/scadalts-ui/src/store/index.js
+++ b/scadalts-ui/src/store/index.js
@@ -75,7 +75,7 @@ export default new Vuex.Store({
 			// useCredentials: true,
 			// credentials: 'same-origin',
 		},
-		webSocketUrl: 'ws-scada/alarmLevel',
+		webSocketUrl: 'ws-scada',
 
 		timePeriods: [
 			{ id: 1, label: i18n.t('common.timeperiod.seconds') },
@@ -94,16 +94,23 @@ export default new Vuex.Store({
 			{ id: 2, label: i18n.t('common.alarmlevels.urgent') },
 			{ id: 3, label: i18n.t('common.alarmlevels.critical') },
 			{ id: 4, label: i18n.t('common.alarmlevels.lifesafety') },
-		],
+		]
 	},
 	mutations: {
 		updateWebSocketUrl(state) {
-            state.webSocketUrl = getAppLocation() + state.webSocketUrl;
+            let base = getAppLocation();
+            if(!state.webSocketUrl.includes(base)) {
+                state.webSocketUrl = base + state.webSocketUrl;
+            }
 		},
 
 		updateRequestTimeout(state, timeout) {
 			state.requestConfig.timeout = timeout > 1000 ? timeout : 1000;
 		},
+
+        setLoggedUser(state, loggedUser) {
+            state.loggedUser = loggedUser;
+        }
 	},
 	actions: {
 		getUserRole() {
@@ -128,7 +135,7 @@ export default new Vuex.Store({
 			axios.defaults.withCredentials = true;
 			let logged = false;
 			let res = await dispatch('requestPostNonApi', {
-			    url: `/login.htm` + `?username=` + userdata.username + `&password=` + userdata.password + `&submit=Login`,
+			    url: `login.htm` + `?username=` + userdata.username + `&password=` + userdata.password + `&submit=Login`,
 			    data: null
 			});
 			if(res != null && res != '') {
@@ -139,7 +146,7 @@ export default new Vuex.Store({
 		},
 
 		logoutUser({ state, dispatch }) {
-			dispatch('requestGetNonApi', `/logout.htm`)
+			dispatch('requestGetNonApi', `logout.htm`)
 			.then((resp) => {
                 state.loggedUser = null;
             });
@@ -151,11 +158,13 @@ export default new Vuex.Store({
 		 * @param {*} param0 - Vuex Store variables
 		 */
 		async getUserInfo({ state, dispatch, commit }) {
-			state.loggedUser = await dispatch('requestGet', '/auth/user');
-			commit('updateWebSocketUrl');
-			commit('INIT_WEBSOCKET_URL');
-			commit('INIT_WEBSOCKET');
-			return state.loggedUser;
+			return dispatch('requestGet', '/auth/user').then((r) => {
+			     commit('setLoggedUser', r);
+                 commit('updateWebSocketUrl');
+                 commit('INIT_WEBSOCKET_URL');
+                 commit('INIT_WEBSOCKET');
+                 return r;
+            });
 		},
 
 		/**
@@ -391,7 +400,7 @@ export default new Vuex.Store({
                             : reject(error.response);
                     });
             });
-        },
+        }
 	},
 	getters: {
 		appVersion: (state) => {
@@ -429,6 +438,9 @@ export default new Vuex.Store({
 		appPullRequestBranch: (state) => {
 			return state.scadaLtsPullRequestBranch;
 		},
+        loggedUser: (state) => {
+             return state.loggedUser;
+        }
 	},
 	plugins: [myLoggerForVuexMutation],
 });
diff --git a/scadalts-ui/src/store/pointHierarchy/index.js b/scadalts-ui/src/store/pointHierarchy/index.js
index 76abca1047..641c0b9c6a 100644
--- a/scadalts-ui/src/store/pointHierarchy/index.js
+++ b/scadalts-ui/src/store/pointHierarchy/index.js
@@ -116,7 +116,7 @@ const gv = {
 			return new Promise((resolve, reject) => {
 				axios
 					.post(
-						`.//pointHierarchy/move/${nodeId}/${parentNodeId}/${newParentNodeId}/${isFolder}`,
+						`./pointHierarchy/move/${nodeId}/${parentNodeId}/${newParentNodeId}/${isFolder}`,
 						requestConfiguration,
 					)
 					.then((resp) => {
diff --git a/scadalts-ui/src/store/systemSettings/index.js b/scadalts-ui/src/store/systemSettings/index.js
index 559e932f4e..eb11e7ea81 100644
--- a/scadalts-ui/src/store/systemSettings/index.js
+++ b/scadalts-ui/src/store/systemSettings/index.js
@@ -23,6 +23,7 @@ const storeSystemSettings = {
 		schemaVersion: undefined,
 		scadaConfig: undefined,
 		defaultLoggingType: undefined,
+		customCss: undefined
 	},
 	mutations: {
 		setDatabaseType(state, databaseType) {
@@ -71,6 +72,9 @@ const storeSystemSettings = {
 		setDefaultLoggingType(state, defaultLoggingType) {
 			state.defaultLoggingType = defaultLoggingType;
 		},
+        setCustomCss(state, customCss) {
+            state.customCss = customCss;
+        }
 	},
 	actions: {
 		getDatabaseType({ commit, dispatch }) {
@@ -272,6 +276,13 @@ const storeSystemSettings = {
 			});
 		},
 
+        getCustomCss({ dispatch, commit }) {
+            return dispatch('requestGet', '/customcss/').then((r) => {
+                commit('setCustomCss', r);
+                return r;
+            });
+        },
+
 		purgeData(context) {
 			return new Promise((resolve, reject) => {
 				axios
diff --git a/scadalts-ui/src/store/websocketStore.js b/scadalts-ui/src/store/websocketStore.js
index 3d0b8f053d..e8a4164b76 100644
--- a/scadalts-ui/src/store/websocketStore.js
+++ b/scadalts-ui/src/store/websocketStore.js
@@ -18,7 +18,11 @@ const webSocketModule = {
 
     mutations: {
         INIT_WEBSOCKET(state) {
-            let socket = new SockJS(getAppLocation() + state.webSocketUrl);
+            let base = getAppLocation();
+            if(!state.webSocketUrl.includes(base)) {
+                state.webSocketUrl = base + state.webSocketUrl;
+            }
+            let socket = new SockJS(state.webSocketUrl);
             let client = Stomp.over(socket);
             if(!state.debugMode) {
                 client.debug = () => {};
diff --git a/scadalts-ui/src/utils/common.js b/scadalts-ui/src/utils/common.js
index 3d7512e045..856cd7e7b5 100644
--- a/scadalts-ui/src/utils/common.js
+++ b/scadalts-ui/src/utils/common.js
@@ -57,6 +57,19 @@ export function getEventList(event, sortByParam, sortDescParam, eventList) {
     }
 }
 
+export function unescapeHtml(value) {
+   let div = document.createElement("div");
+   div.innerHTML = value;
+   return div.textContent || div.innerText;
+}
+
+export function escapeHtml(value) {
+   let div = document.createElement("div");
+   div.textContent = value;
+   div.innerText = value;
+   return div.innerHTML;
+}
+
 function comparatorBy(a, b, sortBy, sortDesc) {
    for(let i = 0; i < sortBy.length; i++) {
        let by = sortBy[i];
diff --git a/scadalts-ui/src/views/Alarms/EventList.vue b/scadalts-ui/src/views/Alarms/EventList.vue
index 418790dadf..64050e8167 100644
--- a/scadalts-ui/src/views/Alarms/EventList.vue
+++ b/scadalts-ui/src/views/Alarms/EventList.vue
@@ -327,7 +327,7 @@
 						{{ $t(`eventList.sourceType${item.typeId}`) }}
 					</template>
 					<template v-slot:item.message="{ item }">
-						<a :title="(item.message) | clearHtml">{{ (item.message) | clearHtml | truncate}}</a>
+						<a><span v-html="item.message"></span></a>
 					</template>
 
 					<template v-slot:item.status="{ item }">
@@ -391,6 +391,10 @@
 						</v-badge>
 
     				</template>
+    				<template v-slot:item.xid="{ item }">
+    				    <span v-if="item.xid" v-html="item.xid"/>
+                        <span v-else> {{$t('event.list.reloadPage')}} </span>
+    				</template>
 			</v-data-table>
 		</v-container>
 		<v-progress-circular v-else indeterminate color="primary"></v-progress-circular>
@@ -412,7 +416,7 @@ tbody tr:nth-of-type(odd) {
 import store from '../../store';
 import RangeChartComponent from '../../components/amcharts/RangeChartComponent.vue';
 import ConfirmationDialog from '@/layout/dialogs/ConfirmationDialog';
-import {getEventList} from '../../utils/common';
+import {getEventList, escapeHtml} from '../../utils/common';
 
 export default {
 	name: 'EventList',
@@ -619,9 +623,6 @@ export default {
 				return input.substring(0, 45) + '...';
 			}
 			return input;
-		},
-		clearHtml(str) {
-			return str.replace(/<[^>]*>?/gm, '').replaceAll('&nbsp;', ' ')
 		}
 	},
 	
@@ -729,9 +730,13 @@ export default {
 			this.loading = false;
 		},
 		async fetchEventSelected() {
-			this.loading = true;
-			this.comments = await this.$store.dispatch('getCommentsByEventId', this.selectedEventId);
-			this.loading = false;
+      try {
+        this.loading = true;
+        this.comments = await this.$store.dispatch('getCommentsByEventId', this.selectedEventId);
+        this.loading = false;
+      } catch (error) {
+        console.error("Error acknowledging event:", error);
+      }
 		},
 		async acknowledgeEventSelected() {
 			this.loading = true;
@@ -755,8 +760,12 @@ export default {
 			await this.fetchEventList();
 		},
 		async acknowledgeEvent(event) {
-			await this.$store.dispatch('acknowledgeEvent', {eventId: event.id});
-			await this.fetchEventList();
+      try {
+			  await this.$store.dispatch('acknowledgeEvent', {eventId: event.id});
+			  await this.fetchEventList();
+      } catch (error) {
+        console.error("Error acknowledging event:", error);
+      }
 		},
 		async silenceEvent(event) {
 			await this.$store.dispatch('silenceEvent', {eventId: event.id});
@@ -795,6 +804,23 @@ export default {
         fetchEvent(message, searchFilters) {
             if(message) {
                 let event = JSON.parse(message.body);
+                event.message = escapeHtml(event.message);
+                event.shortMessage = escapeHtml(event.shortMessage);
+                event.assigneeUsername = escapeHtml(event.assigneeUsername);
+                event.ackMessage = escapeHtml(event.ackMessage);
+                event.acknowledgedByUsername = escapeHtml(event.acknowledgedByUsername);
+                event.action = escapeHtml(event.action);
+                event.assigneeMessage = escapeHtml(event.assigneeMessage);
+                event.exportAckMessage = escapeHtml(event.exportAckMessage);
+                event.assigneeUsername = escapeHtml(event.assigneeUsername);
+                event.ackMessage = escapeHtml(event.ackMessage);
+                event.fullPrettyAcknowledgedTimestamp = escapeHtml(event.fullPrettyAcknowledgedTimestamp);
+                event.fullPrettyActiveTimestamp = escapeHtml(event.fullPrettyActiveTimestamp);
+                event.fullPrettyRtnTimestamp = escapeHtml(event.fullPrettyRtnTimestamp);
+                event.prettyActiveTimestamp = escapeHtml(event.prettyActiveTimestamp);
+                event.prettyRtnTimestamp = escapeHtml(event.prettyRtnTimestamp);
+                event.rtnMessage = escapeHtml(event.rtnMessage);
+
                 let sortBy = searchFilters.sortBy;
                 let sortDesc = searchFilters.sortDesc;
 
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointComment.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointComment.vue
index ad25c3ae6a..63b4cdf48d 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointComment.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointComment.vue
@@ -20,10 +20,11 @@
 					</v-list-item-icon>
 					<v-list-item-content>
 						<v-list-item-title>
-							{{ comment.comment }}
+							<span v-html="comment.comment"></span>
 						</v-list-item-title>
 						<v-list-item-subtitle>
-							{{ comment.username }}, {{ new Date(comment.ts).toLocaleString() }}
+							<span v-html="comment.username"></span>,
+							{{ new Date(comment.ts).toLocaleString() }}
 						</v-list-item-subtitle>
 					</v-list-item-content>
 					<v-list-item-action
@@ -87,7 +88,7 @@ export default {
 			this.activeUserId = this.$store.state.loggedUser.id;
 		},
 
-		addComment() {
+		async addComment() {
 			let time = new Date();
 			let comment = {
 				userId: this.$store.state.loggedUser.id,
@@ -96,13 +97,13 @@ export default {
 				username: this.$store.state.loggedUser.username,
 				prettyTime: time.toLocaleTimeString(),
 			};
-			this.data.comments.push(Object.assign({}, comment));
-			this.$store.dispatch('addUserComment', {
+			let response = await this.$store.dispatch('addUserComment', {
 				comment: comment,
 				typeId: 2,
 				refId: this.data.id,
 			});
 			this.newComment = '';
+			this.data.comments.push(Object.assign({}, response));
 		},
 
 		deleteComment(e) {
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointEventList.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointEventList.vue
index b289d7e72e..7a0ed12ede 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointEventList.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointEventList.vue
@@ -120,10 +120,10 @@
 										</v-list-item-icon>
 										<v-list-item-content>
 											<v-list-item-title>
-												{{ comment.comment }}
+												<span v-html="comment.comment"></span>
 											</v-list-item-title>
 											<v-list-item-subtitle>
-												{{ comment.username }},
+												<span v-html="comment.username"></span>,
 												{{ new Date(comment.ts).toLocaleString() }}
 											</v-list-item-subtitle>
 										</v-list-item-content>
@@ -245,7 +245,7 @@ export default {
 			}
 		},
 
-		addComment(e) {
+		async addComment(e) {
 			let time = new Date();
 			let comment = {
 				userId: this.$store.state.loggedUser.id,
@@ -254,13 +254,13 @@ export default {
 				username: this.$store.state.loggedUser.username,
 				prettyTime: time.toLocaleTimeString(),
 			};
-			e.userComments.push(Object.assign({}, comment));
-			this.$store.dispatch('addUserComment', {
+			let response = await this.$store.dispatch('addUserComment', {
 				comment: comment,
 				typeId: 1,
 				refId: e.id,
 			});
 			this.newComment = '';
+			e.userComments.push(Object.assign({}, response));
 		},
 
 		deleteComment(e, comment) {
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointList.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointList.vue
index a576419c59..440a737f8b 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointList.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointList.vue
@@ -32,6 +32,18 @@
 				<template v-slot:item.typeId="{ item }">
 					{{ $t(`datapoint.type.${item.typeId}`) }}
 				</template>
+                <template v-slot:item.name="{ item }">
+                    <span v-html="item.name"></span>
+                </template>
+                <template v-slot:item.datasourceName="{ item }">
+                    <span v-html="item.datasourceName"></span>
+                </template>
+                <template v-slot:item.description="{ item }">
+                    <span v-html="item.description"></span>
+                </template>
+                <template v-slot:item.xid="{ item }">
+                    <span v-html="item.xid"></span>
+                </template>
 			</v-data-table>
 		</v-container>
 		<v-progress-circular v-else indeterminate color="primary"></v-progress-circular>
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointValueHistory.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointValueHistory.vue
index 5c6726f52e..072c2fffb0 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointValueHistory.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/DataPointValueHistory.vue
@@ -254,7 +254,6 @@ export default {
 	methods: {
 
 		updatePointWs(data) {
-			console.log("updatePointWs", data);
 			this.pointValue = JSON.parse(data.body).value;
 			this.fetchData();
 		},
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/PointProperties/index.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/PointProperties/index.vue
index f884556eda..128bf86e88 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/PointProperties/index.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/PointProperties/index.vue
@@ -66,7 +66,7 @@
 
 							<v-col md="6" cols="12">
 								<v-text-field
-									v-model="data.name"
+									v-model="data.tempName"
 									:label="$t('datapointDetails.pointProperties.point.name')"
 									dense
 								></v-text-field>
@@ -75,12 +75,12 @@
 							<v-col md="6" cols="12" @click="navToDataSource">
 								<v-btn text block>
 									<v-icon>mdi-database </v-icon>
-									<span> {{ data.dataSourceName }}</span>
+									<span v-html="data.dataSourceName" ></span>
 								</v-btn>
 							</v-col>
 							<v-col cols="12">
 								<v-text-field
-									v-model="data.description"
+									v-model="data.tempDescription"
 									:label="$t('datapointDetails.pointProperties.point.description')"
 									dense
 								></v-text-field>
@@ -150,13 +150,21 @@ export default {
 	data() {
 		return {
 			dialog: false,
-			purgeDialog: false,
+			purgeDialog: false
 		};
 	},
 
+    mounted() {
+        this.reload();
+    },
+
 	methods: {
 		save() {
-			this.$emit('saved');
+            let datapoint = JSON.parse(JSON.stringify(this.data));
+            datapoint.name = this.data.tempName;
+            datapoint.description = this.data.tempDescription;
+
+			this.$emit('saved', datapoint);
 			this.dialog = false;
 		},
 
@@ -197,6 +205,11 @@ export default {
 				}/data_source_edit.shtm?dsid=${this.data.dataSourceId}&pid=${this.data.id}`,
 			);
 		},
+
+		reload() {
+            this.data.tempName = this.data.name;
+            this.data.tempDescription = this.data.description;
+		}
 	},
 };
 </script>
diff --git a/scadalts-ui/src/views/DataObjects/DataPointDetails/index.vue b/scadalts-ui/src/views/DataObjects/DataPointDetails/index.vue
index f61ae0fffd..8f613d0931 100644
--- a/scadalts-ui/src/views/DataObjects/DataPointDetails/index.vue
+++ b/scadalts-ui/src/views/DataObjects/DataPointDetails/index.vue
@@ -33,15 +33,15 @@
 								$t('datapointDetails.pointProperties.toggle.datasourceDisabled')
 							}}</span>
 						</v-tooltip>
-						{{ dataPointDetails.name }}
+						<span v-html="dataPointDetails.name" ></span>
 						<DataPointComment :data="dataPointDetails"></DataPointComment>
 					</h1>
 					<p class="thin-top-margin small-description">
-						<span>{{ dataPointDetails.xid }}</span>
+						<span v-html="dataPointDetails.xid" ></span>
 						<span v-if="dataPointDetails.description">
 							<span v-if="dataPointDetails.description.length > 0">
-								- {{ dataPointDetails.description }}</span
-							>
+								- <span v-html="dataPointDetails.description" ></span>
+							</span>
 						</span>
 					</p>
 				</v-col>
@@ -49,6 +49,7 @@
 					<PointProperties
 						:data="dataPointDetails"
 						@saved="saveDataPointDetails"
+						ref="pointProperties"
 					></PointProperties>
 				</v-col>
 				<v-col cols="2">
@@ -160,6 +161,8 @@ export default {
 					'getDatasourceByXid',
 					this.dataPointDetails.dataSourceXid,
 				);
+				if(this.$refs.pointProperties)
+				    this.$refs.pointProperties.reload();
 			} catch (e) {
 				this.dataPointDetails = null;
 				this.datasource = null;
@@ -186,22 +189,22 @@ export default {
 			}
 		},
 
-		saveDataPointDetails() {
+		saveDataPointDetails(data) {
 			this.$store
-				.dispatch('saveDataPointDetails', this.dataPointDetails)
+				.dispatch('saveDataPointDetails', data)
 				.catch((e) => {
 					this.$store.dispatch(
 						'showErrorNotification', 
 						`${this.$t('common.snackbar.update.fail')} | ${e.data.errors}`)
 				})
 				.then((resp) => {
-					if (resp === 'saved') {
+					if (resp.status === 'saved') {
 						this.$store.dispatch(
 							'showSuccessNotification',
 							this.$t('common.snackbar.update.success')
 						);
 						this.$refs.valueHistory.fetchData();
-
+                        this.fetchDataPointDetails(data.id);
 					}
 				});
 		},
diff --git a/scadalts-ui/src/views/DataObjects/DataSources/DataSourceEvents.vue b/scadalts-ui/src/views/DataObjects/DataSources/DataSourceEvents.vue
index ea28a621b3..86d30596ab 100644
--- a/scadalts-ui/src/views/DataObjects/DataSources/DataSourceEvents.vue
+++ b/scadalts-ui/src/views/DataObjects/DataSources/DataSourceEvents.vue
@@ -119,10 +119,10 @@
 											</v-list-item-icon>
 											<v-list-item-content>
 												<v-list-item-title>
-													{{ comment.comment }}
+													<span v-html="comment.comment"></span>
 												</v-list-item-title>
 												<v-list-item-subtitle>
-													{{ comment.username }},
+													<span v-html="comment.username"></span>,
 													{{ new Date(comment.ts).toLocaleString() }}
 												</v-list-item-subtitle>
 											</v-list-item-content>
diff --git a/scadalts-ui/src/views/DataObjects/DataSources/DataSourcePointList.vue b/scadalts-ui/src/views/DataObjects/DataSources/DataSourcePointList.vue
index 1f1568bb8d..07a771a605 100644
--- a/scadalts-ui/src/views/DataObjects/DataSources/DataSourcePointList.vue
+++ b/scadalts-ui/src/views/DataObjects/DataSources/DataSourcePointList.vue
@@ -23,23 +23,22 @@
 								<template v-slot:activator="{ on, attrs }">
 									<v-row v-bind="attrs" v-on="on">
 										<v-col cols="12" sm="9" lg="9" xl="6" class="text-main-primary">
-											{{ dp.name.length > 45 ? dp.name.substring(0, 45) + '...' : dp.name }}
+										    <span v-html="reduceName(dp.name)" ></span></br>
 										</v-col>
 										<v-col cols="2" sm="3" xl="2" v-show="$vuetify.breakpoint.sm || $vuetify.breakpoint.lg || $vuetify.breakpoint.xl" class="text-secondary">
-											{{ dp.xid }}
+											<span v-html="dp.xid"></span><br/>
 										</v-col>
 										<v-col cols="4" xl="4" v-show="$vuetify.breakpoint.xl" class="text-secondary">
-											{{ dp.description }}
+											<span v-html="dp.description" ></span>
 										</v-col>
 									</v-row>
 								</template>
 								<span>
 									<span v-if="dp.name.length > 45">
-										{{ dp.name }}</br>
+										<span v-html="dp.name" ></span></br>
 									</span>
-									<span>{{ dp.xid }}</span
-									><br />
-									<span>{{ dp.description }}</span>
+									<span v-html="dp.xid" ></span><br/>
+									<span v-html="dp.description" ></span>
 								</span>
 							</v-tooltip>
 						</v-col>
@@ -156,6 +155,9 @@ export default {
 			this.$router.push({ name: 'datapoint-details', params: { id: datapoint.id } });
 			this.$router.go();
 		},
+		reduceName(value) {
+		    return value.length > 45 ? value.substring(0, 45) + '...' : value;
+		}
 	},
 };
 </script>
diff --git a/scadalts-ui/src/views/DataObjects/DataSources/index.vue b/scadalts-ui/src/views/DataObjects/DataSources/index.vue
index a20198de83..a6f8342d1a 100644
--- a/scadalts-ui/src/views/DataObjects/DataSources/index.vue
+++ b/scadalts-ui/src/views/DataObjects/DataSources/index.vue
@@ -68,9 +68,15 @@
 						</v-btn>
 					</v-badge>
 				</template>
+                <template v-slot:item.name="{ item }">
+                    <span v-html="item.name" ></span>
+                </template>
 				<template v-slot:item.type="{ item }">
 					{{ $t(`datasource.type.${$store.getters.dataSourceTypeName(item.type)}`) }}
 				</template>
+                <template v-slot:item.xid="{ item }">
+                    <span v-html="item.xid" ></span>
+                </template>
 				<template v-slot:expanded-item="{ headers, item }">
 					<!-- Single Data Source Item Details Row -->
 					<td
diff --git a/scadalts-ui/src/views/Reports/DataPointsDialog.vue b/scadalts-ui/src/views/Reports/DataPointsDialog.vue
index 2f91c37718..b52f6a119e 100644
--- a/scadalts-ui/src/views/Reports/DataPointsDialog.vue
+++ b/scadalts-ui/src/views/Reports/DataPointsDialog.vue
@@ -27,7 +27,7 @@
                             <v-list-item v-for="p in report.points" :key="p.pointId">
                                 
                                 <v-list-item-title>
-                                    {{ p.name }}
+                                    <span v-html="p.extendName"></span>
                                 </v-list-item-title>
 
                                 <v-list-item-action class="datapoint--actions">
@@ -64,6 +64,7 @@
 </template>
 <script>
 import DataPointSearchComponent from '@/layout/buttons/DataPointSearchComponent';
+
 export default {
     components: {
         DataPointSearchComponent
@@ -88,6 +89,7 @@ export default {
                     pointId: point.id,
                     pointXid: point.xid,
                     name: point.name,
+                    extendName: point.extendName,
                     colour: '#000000',
                     consolidatedChart: true,
                 }
diff --git a/scadalts-ui/src/views/Reports/ReportsData.vue b/scadalts-ui/src/views/Reports/ReportsData.vue
index 1c6c67a897..fb0374a8eb 100644
--- a/scadalts-ui/src/views/Reports/ReportsData.vue
+++ b/scadalts-ui/src/views/Reports/ReportsData.vue
@@ -49,6 +49,9 @@
 									:checked="item.preventPurge"
 								/>
 							</template>
+                            <template v-slot:item.name="{ item }">
+                                <span v-html="item.name"></span>
+                            </template>
 						</v-data-table>
 					</v-card>
 				</v-col>
diff --git a/scadalts-ui/src/views/Reports/ReportsForm.vue b/scadalts-ui/src/views/Reports/ReportsForm.vue
index c4089d8ec1..c960781091 100644
--- a/scadalts-ui/src/views/Reports/ReportsForm.vue
+++ b/scadalts-ui/src/views/Reports/ReportsForm.vue
@@ -17,7 +17,7 @@
                 <v-col>
                     <v-text-field 
                         :label="$t('common.name')"
-						v-model="report.name"
+						v-model="report.tempName"
                     ></v-text-field>
                 </v-col>
                 <v-col>
@@ -321,10 +321,12 @@
 							<v-text-field
 								v-model="email"
 								label="Add email address"
-								append-outer-icon="mdi-plus"
-								@click:append-outer="addMail"
 								:rules="emailRules"
-							></v-text-field>
+							>
+							   <template slot="append-outer">
+                                 <v-icon v-if="validEmail" color="green darken-2" @click="addMail" >mdi-plus</v-icon>
+                               </template>
+                            </v-text-field>
 						</v-col>
 					</v-row>
 				</v-col>
@@ -368,6 +370,8 @@
 import { RECIPIENT } from '../../store/mailingList/constants';
 import { ALARM_OPTIONS, DATE_RANGE_TYPE_OPTIONS } from '../../store/reports/constants';
 import DataPointsSettingsDialog from './DataPointsDialog.vue'
+import {unescapeHtml} from '@/utils/common';
+
 export default {
     components: {
 		DataPointsSettingsDialog
@@ -390,13 +394,15 @@ export default {
 				this.$t('reports.cronPatternMustBeValid')
 			],
 			emailRules: [
-				v =>  /\S+@\S+\.\S+/.test(v) || this.$t('reports.emailMustBeValid')
+				v =>  /\S+@\S+\.\S+/.test(v) || this.$t('reports.emailMustBeValid'),
+				v => !(/^(.*?((expression\s*\()|url\s*\(\s*['\"]?javascript:|url\s*\(\s*['\"]?data:|<script[^>]*>|<\/script>|<img[^>]+onerror=|@import\s+url\s*\(\s*['\"]?javascript:|<img[^>]*>|<script[^>]*>|<[^>]+>onerror\s*=|onload\s*=|eval\s*\(|alert\s*\(|onerror\s*=|document.location){1}.*?)$/.test(v)) || this.$t('reports.emailMustBeValid')
 			],
 
 			userList: [],
-			recipientList: [],	
-			email: '',
+			recipientList: [],
 			activeRecipients: [],
+			validEmail: false,
+			emailText: ''
         }
     },
     computed: {
@@ -411,7 +417,16 @@ export default {
 			});
 			periods.push({id: 0, label: 'Cron pattern'})
 			return  periods;
-		}
+		},
+        email: {
+          get() {
+            return this.emailText;
+          },
+          set(newValue) {
+            this.validEmail = this.validateEmail(newValue);
+            this.emailText = newValue;
+          }
+        }
     },
 
 	mounted() {
@@ -425,11 +440,14 @@ export default {
 			this.initDateTimeFields();
 			this.initReportTimeFields();
 			this.initRecipients();
+			this.report.tempName= this.report.name;
 		},
 
 		saveReport() {
 			this.setDateTime();
-			this.$emit('saved', this.report);
+			let report = JSON.parse(JSON.stringify(this.report));
+			report.name = this.report.tempName;
+			this.$emit('saved', report);
 		},
 
 		async fetchUserList() {
@@ -527,6 +545,7 @@ export default {
 		initRecipients() {
 			this.activeRecipients = [];
 			this.report.recipients.forEach(r => {
+			    r.referenceAddress = unescapeHtml(r.referenceAddress);
 				let entry = { 
 					type: r.recipientType, 
 					name: '', 
@@ -598,9 +617,14 @@ export default {
 				}))
 			.then(() => this.$store.dispatch("showSuccessNotification", "Test emails sent successfully"))
 			.catch(() => this.$slots.dispatch("showErrorNotification", "Test emails could not be sent"));
-		}
+		},
 
-		
+        validateEmail(v) {
+            if(!v) {
+                return false;
+            }
+            return !(typeof this.emailRules[0](v) === 'string') && !(typeof this.emailRules[1](v) === 'string');
+        }
 	}
 }
 </script>
diff --git a/scadalts-ui/src/views/Reports/ReportsPage.vue b/scadalts-ui/src/views/Reports/ReportsPage.vue
index b90a487eec..83916822c5 100644
--- a/scadalts-ui/src/views/Reports/ReportsPage.vue
+++ b/scadalts-ui/src/views/Reports/ReportsPage.vue
@@ -27,7 +27,7 @@
 							@click:row="clickRow"
 						>
 							<template v-slot:item.name="{ item }">
-								{{ item.name }}
+								<span v-html="item.name"></span>
 							</template>
 							<template v-slot:item.actions="{ item }">
 								<v-btn icon @click.stop="runReport(item.id)">
@@ -197,7 +197,8 @@ export default {
 		_updateReportPointsDetails(pointList) {
 			return pointList.map((p) => {
 				const name = this.allDataPoints.find((dp) => dp.id === p.pointId).name;
-				return { ...p, name };
+				const extendName = this.allDataPoints.find((dp) => dp.id === p.pointId).extendName;
+				return { ...p, name, extendName };
 			});
 		},
 	},
diff --git a/scadalts-ui/src/views/SynopticPanel/SynopticPanelItem.vue b/scadalts-ui/src/views/SynopticPanel/SynopticPanelItem.vue
index b05d4244b8..5f72ccd4f6 100644
--- a/scadalts-ui/src/views/SynopticPanel/SynopticPanelItem.vue
+++ b/scadalts-ui/src/views/SynopticPanel/SynopticPanelItem.vue
@@ -34,6 +34,7 @@
 <script>
 import customComponentMixin from '../../components/SynopticPanel/CustomComponentMixin.js';
 import SynopticPanelItemEditor from './SynopticPanelItemEditor.vue';
+import {unescapeHtml} from '../../utils/common';
 
 /**
  * Synoptic Panel component - Item
@@ -85,9 +86,10 @@ export default {
 			if (!!dom && !!dom.firstChild) {
 				dom.firstChild.remove();
 			}
+			let vectorImage = unescapeHtml(this.panel.vectorImage);
 			this.$svg('panel-canvas')
 				.size(window.innerWidth, window.innerHeight)
-				.svg(this.panel.vectorImage);
+				.svg(vectorImage);
 			this.$emit('loaded', this.panel.id);
 			this.initSvgComponentData();
 		},
@@ -120,7 +122,8 @@ export default {
 		initSvgComponentData() {
 			try {
 				let graphicItems = this.parseSvgContent();
-				let componentData = new Map(JSON.parse(this.panel.componentData));
+				let unescapeComponentData = unescapeHtml(this.panel.componentData);
+				let componentData = new Map(JSON.parse(unescapeComponentData));
 				if (componentData !== undefined) {
 					for (const [key, value] of componentData.entries()) {
 						graphicItems.set(key, value);
@@ -136,7 +139,8 @@ export default {
 		savePanel(childGraphicItems) {
 			this.graphicItems = childGraphicItems;
 			this.panel.componentData = JSON.stringify([...this.graphicItems]);
-			
+			this.panel.vectorImage = unescapeHtml(this.panel.vectorImage);
+
             this.$store.dispatch('updateSynopticPanel', this.panel).then(() => {
                 this.$emit('updated', true);
             }).catch(() => {
diff --git a/scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue b/scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue
index 81259eb23f..7e7aedde63 100644
--- a/scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue
+++ b/scadalts-ui/src/views/System/SystemSettings/MiscSettingsComponent.vue
@@ -33,29 +33,29 @@
                     </v-col>
                     <v-col cols="12">
                         <v-switch
-                            v-model="miscSettings.enableFullScreen"
-                            :label="$t('systemsettings.view.forceFullScreen')"
+                            v-model="miscSettings.viewForceFullScreenEnabled"
+                            :label="$t('systemsettings.misc.viewForceFullScreenEnabled')"
                             @change="watchDataChange()"
                         ></v-switch>
                     </v-col>
                     <v-col cols="12">
                         <v-switch
-                            v-model="miscSettings.hideShortcutDisableFullScreen"
-                            :label="$t('systemsettings.view.hideShortcutDisableFullScreen')"
+                            v-model="miscSettings.viewHideShortcutDisableFullScreenEnabled"
+                            :label="$t('systemsettings.misc.viewHideShortcutDisableFullScreenEnabled')"
                             @change="watchDataChange()"
                         ></v-switch>
                     </v-col>
                     <v-col cols="12">
                         <v-switch
                             v-model="miscSettings.eventPendingCacheEnabled"
-                            :label="$t('systemsettings.event.pendingCacheEnabled')"
+                            :label="$t('systemsettings.misc.eventPendingCacheEnabled')"
                             @change="watchDataChange()"
                         ></v-switch>
                     </v-col>
                     <v-col cols="12">
                         <v-text-field
                             v-model="miscSettings.eventPendingLimit"
-                            :label="$t('systemsettings.event.pendingLimit')"
+                            :label="$t('systemsettings.misc.eventPendingLimit')"
                             @change="watchDataChange()"
                             type="number"
                             dense
@@ -64,21 +64,21 @@
                     <v-col cols="12">
                         <v-switch
                             v-model="miscSettings.workItemsReportingEnabled"
-                            :label="$t('systemsettings.workitems.reporting.enabled')"
+                            :label="$t('systemsettings.misc.workItemsReportingEnabled')"
                             @change="watchDataChange()"
                         ></v-switch>
                     </v-col>
                     <v-col cols="12">
                         <v-switch
                             v-model="miscSettings.workItemsReportingItemsPerSecondEnabled"
-                            :label="$t('systemsettings.workitems.reporting.itemspersecond.enabled')"
+                            :label="$t('systemsettings.misc.workItemsReportingItemsPerSecondEnabled')"
                             @change="watchDataChange()"
                         ></v-switch>
                     </v-col>
                     <v-col cols="12">
                         <v-text-field
                             v-model="miscSettings.workItemsReportingItemsPerSecondLimit"
-                            :label="$t('systemsettings.workitems.reporting.itemspersecond.limit')"
+                            :label="$t('systemsettings.misc.workItemsReportingItemsPerSecondLimit')"
                             @change="watchDataChange()"
                             type="number"
                             dense
@@ -87,7 +87,7 @@
                     <v-col cols="12">
                         <v-text-field
                             v-model="miscSettings.threadsNameAdditionalLength"
-                            :label="$t('systemsettings.threads.name.additional.length')"
+                            :label="$t('systemsettings.misc.threadsNameAdditionalLength')"
                             @change="watchDataChange()"
                             type="number"
                             dense
@@ -96,7 +96,7 @@
                     <v-col cols="12">
                       <v-text-field
                           v-model="miscSettings.webResourceGraphicsPath"
-                          :label="$t('systemsettings.webresource.graphics.path')"
+                          :label="$t('systemsettings.misc.webResourceGraphicsPath')"
                           @change="watchDataChange()"
                           :rules="[validateGraphicsPath]"
                       ></v-text-field>
@@ -104,12 +104,19 @@
                     <v-col cols="12">
                       <v-text-field
                           v-model="miscSettings.webResourceUploadsPath"
-                          :label="$t('systemsettings.webresource.uploads.path')"
+                          :label="$t('systemsettings.misc.webResourceUploadsPath')"
                           @change="watchDataChange()"
                           :rules="[validateUploadsPath]"
                       ></v-text-field>
                     </v-col>
-                </v-row>
+                    <v-col cols="12">
+                      <v-switch
+                          v-model="miscSettings.eventAssignEnabled"
+                          :label="$t('systemsettings.misc.eventAssignEnabled')"
+                          @change="watchDataChange()"
+                      ></v-switch>
+                    </v-col>
+        </v-row>
 			</v-card-text>
 		</v-card>
 	</v-col>
@@ -254,7 +261,7 @@ export default {
         return true;
       } else {
         this.validatedPaths.push({key: validGraphicsKey,value: false})
-        return this.$t("systemsettings.webresource.graphics.path.wrong", {0: path.sep});
+        return this.$t("systemsettings.misc.webResourceGraphicsPath.wrong", {0: path.sep});
       }
     },
     validateUploadsPath(v) {
@@ -267,7 +274,7 @@ export default {
         return true;
       } else {
         this.validatedPaths.push({key: validUploadsKey, value: false})
-        return this.$t("systemsettings.webresource.uploads.path.wrong", {0: path.sep});
+        return this.$t("systemsettings.misc.webResourceUploadsPath.wrong", {0: path.sep});
       }
     },
     validateForm(paths) {
diff --git a/scadalts-ui/src/views/System/SystemSettings/index.vue b/scadalts-ui/src/views/System/SystemSettings/index.vue
index 5923ca8e28..9ea86bf15b 100644
--- a/scadalts-ui/src/views/System/SystemSettings/index.vue
+++ b/scadalts-ui/src/views/System/SystemSettings/index.vue
@@ -181,6 +181,20 @@
 							></v-select>
 						</v-col>
 					</v-row>
+					<v-col cols="12">
+						<v-text-field
+							v-model="systemInfoSettings.topDescriptionPrefix"
+							:label="$t('systemsettings.top.description.prefix')"
+							@focusout="saveSystemInfoSettings()"
+						></v-text-field>
+					</v-col>
+					<v-col cols="12">
+						<v-text-field
+							v-model="systemInfoSettings.topDescription"
+							:label="$t('systemsettings.top.description')"
+							@focusout="saveSystemInfoSettings()"
+						></v-text-field>
+					</v-col>
 
 					<data-base-info-component></data-base-info-component>
 
@@ -328,11 +342,16 @@ export default {
 		if (!this.isUserRoleAdmin) {
 			this.getUserRole();
 		}
-		store.dispatch('getSystemInfoSettings');
+		this.fetchSystemInfoSettings();
 		this.loadClock();
 		this.scrollToComponent();
 	},
+
 	methods: {
+		async fetchSystemInfoSettings() {
+			await this.$store.dispatch('getSystemInfoSettings');
+		},
+
 		scrollToComponent() {
 			let element = window.location.href.split('#')[2];
 			if (!!element) {
@@ -354,7 +373,7 @@ export default {
 					i18n.locale = this.systemInfoSettings.language;
 					this.generateNotification(
 						'success',
-						i18n.t('systemsettings.notification.save.systeminfo'),
+						i18n.t('systemsettings.notification.save.systeminfo')
 					);
 				} else {
 					this.generateNotification('danger', i18n.t('systemsettings.notification.fail'));
diff --git a/scadalts-ui/tests/mocks/store/systemSettings/index.js b/scadalts-ui/tests/mocks/store/systemSettings/index.js
index 4be154e2b2..1dfefbd58a 100644
--- a/scadalts-ui/tests/mocks/store/systemSettings/index.js
+++ b/scadalts-ui/tests/mocks/store/systemSettings/index.js
@@ -13,6 +13,8 @@ const storeSystemSettings = {
 			instanceDescription: 'Scada-LTS 2.3.3',
 			language: 'en',
 			newVersionNotificationLevel: '0',
+			topDescriptionPrefix: '',
+			topDescription: '',
 		},
 		emailSettings: {
 			auth: false,
diff --git a/scadalts-ui/tests/unit/DataSources/DataSourceConfig.spec.js b/scadalts-ui/tests/unit/DataSources/DataSourceConfig.spec.js
index d4811db0d8..aa57390e1c 100644
--- a/scadalts-ui/tests/unit/DataSources/DataSourceConfig.spec.js
+++ b/scadalts-ui/tests/unit/DataSources/DataSourceConfig.spec.js
@@ -26,7 +26,7 @@ context('💠️ Test DataSourceConfig Base Component', () => {
         });
 
         it('Is title rendered', () => {
-            expect(dialogText).to.contain('Create  Data Source Config');
+            expect(dialogText).to.contain('Create Data Source Config');
         });
 
         it('Is data source name field rendered', () => {
@@ -62,7 +62,7 @@ context('💠️ Test DataSourceConfig Base Component', () => {
         });
 
         it('Is title rendered', () => {
-            expect(dialogText).to.contain('Update  Data Source Config');
+            expect(dialogText).to.contain('Update Data Source Config');
         });
 
         it('Is update button visible', () => {
@@ -82,7 +82,7 @@ context('💠️ Test DataSourceConfig Base Component', () => {
         });
 
         it('Is title rendered', () => {
-            expect(dialogText).to.contain('Create  Data Source Config');
+            expect(dialogText).to.contain('Create Data Source Config');
         });
 
         it('Is update period field not rendered', () => {
@@ -102,7 +102,7 @@ context('💠️ Test DataSourceConfig Base Component', () => {
 
         it('Is Unique XID generated on mounted() hook', async() => {
             await wrapper.vm.$nextTick();
-            expect(wrapper.vm.datasource.xid).to.equal('UNIT_XID_01');
+            expect(wrapper.vm.datasource.tempXid).to.equal('UNIT_XID_01');
         });
 
         it('CheckXidUnique valid', async() => {
@@ -112,7 +112,7 @@ context('💠️ Test DataSourceConfig Base Component', () => {
         });
 
         it('CheckXidUnique not-valid', async() => {
-            wrapper.vm.datasource.xid = 'NOT_UNIQUE';
+            wrapper.vm.datasource.tempXid = 'NOT_UNIQUE';
             wrapper.vm.checkXidUnique()
             await wrapper.vm.$nextTick();
             expect(wrapper.vm.xidUnique).to.be.false;
diff --git a/scadalts-ui/tests/unit/DataSources/VirtualDataSource.spec.js b/scadalts-ui/tests/unit/DataSources/VirtualDataSource.spec.js
index 599dae449a..6b2df713dc 100644
--- a/scadalts-ui/tests/unit/DataSources/VirtualDataSource.spec.js
+++ b/scadalts-ui/tests/unit/DataSources/VirtualDataSource.spec.js
@@ -24,7 +24,7 @@ context('💠️ Test DataSource Component - Virtual Scenario', () => {
         it('Are DataSource labels rendered', async() => {
             await wrapper.vm.$nextTick();
             const dialogText = wrapper.get('#datasource-config').text();
-            expect(dialogText).to.contain('Create  Virtual Data Source');
+            expect(dialogText).to.contain('Create Virtual Data Source');
             expect(dialogText).to.contain('DataSource Name');
             expect(dialogText).to.contain('DataSource Export Id');
             expect(dialogText).to.contain('Update Period');
@@ -75,6 +75,8 @@ context('💠️ Test DataSource Component - Virtual Scenario', () => {
                     xid: "MTS_0123456789",
                     updatePeriod: 10,
                     updatePeriodType: 2,
+                    tempName: "test name",
+                    tempXid: "test xid"
                 }
             });
         });
@@ -82,7 +84,7 @@ context('💠️ Test DataSource Component - Virtual Scenario', () => {
         it('Are DataSource labels rendered', async() => {
             await wrapper.vm.$nextTick();
             const dialogText = wrapper.get('#datasource-config').text();
-            expect(dialogText).to.contain('Update  Virtual Data Source');
+            expect(dialogText).to.contain('Update Virtual Data Source');
             expect(dialogText).to.contain('DataSource Name');
             expect(dialogText).to.contain('DataSource Export Id');
             expect(dialogText).to.contain('Update Period');
@@ -102,6 +104,8 @@ context('💠️ Test DataSource Component - Virtual Scenario', () => {
                     xid: "MTS_0123456789",
                     updatePeriod: 10,
                     updatePeriodType: 2,
+                    tempName: "test name",
+                    tempXid: "test xid"
                 }
             });
         });
@@ -110,14 +114,14 @@ context('💠️ Test DataSource Component - Virtual Scenario', () => {
             const value = "MockDataSourceEdit";
             const nameInput = wrapper.get('#datasource-config--name input');
             nameInput.setValue(value);
-            expect(wrapper.vm.datasource.name).to.equal(value);
+            expect(wrapper.vm.datasource.tempName).to.equal(value);
         });
 
         it('Is ExportID changing', async() => {
             const value = "XID_TEST_01";
             const nameInput = wrapper.get('#datasource-config--xid input');
             nameInput.setValue(value);
-            expect(wrapper.vm.datasource.xid).to.equal(value);
+            expect(wrapper.vm.datasource.tempXid).to.equal(value);
         }); 
 
         it('Is Update Period time changing', async() => {
diff --git a/scadalts-ui/tests/utils/testing-utils.js b/scadalts-ui/tests/utils/testing-utils.js
index ea113d218e..b56ad4274f 100644
--- a/scadalts-ui/tests/utils/testing-utils.js
+++ b/scadalts-ui/tests/utils/testing-utils.js
@@ -82,6 +82,7 @@ export function prepareShallowMountWrapper(
 		vuetify,
 		store,
 		i18n,
+		router,
 		propsData,
 		...options,
 	});
diff --git a/src/br/org/scadabr/api/dao/MangoDaoImpl.java b/src/br/org/scadabr/api/dao/MangoDaoImpl.java
index 2e79b56767..a001e19970 100644
--- a/src/br/org/scadabr/api/dao/MangoDaoImpl.java
+++ b/src/br/org/scadabr/api/dao/MangoDaoImpl.java
@@ -567,7 +567,7 @@ public EventNotification ackEvent(int eventId) throws ScadaBRAPIException {
 
 		if (eventInstance != null) {
 			// alternateAckSource? - REM
-			eventService.ackEvent(eventId, 1, 0, 0);
+			eventService.ackEvent(eventInstance, 1, this.user, 0);
 			// new EventDao().ackEvent(eventId, 1);
 			return APIUtils.toEventNotification(eventInstance);
 		} else {
@@ -1237,7 +1237,7 @@ public int configureDataPoint(int dataSourceId,
 		mangoPoint.setPointLocator(mangoLocator);
 		DwrResponseI18n validate = new DwrResponseI18n();
 		validate(mangoPoint, validate);
-		mangoLocator.validate(validate);
+		mangoLocator.validate(validate, point.getId());
 		if (validate.getHasMessages()) {
 			throw new ScadaBRAPIException(new APIError(
 					ErrorCode.INVALID_PARAMETER,
diff --git a/src/br/org/scadabr/rt/dataSource/alpha2/Alpha2DataSource.java b/src/br/org/scadabr/rt/dataSource/alpha2/Alpha2DataSource.java
index d8d427c075..6e92af5a81 100644
--- a/src/br/org/scadabr/rt/dataSource/alpha2/Alpha2DataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/alpha2/Alpha2DataSource.java
@@ -22,10 +22,14 @@
 import com.serotonin.mango.rt.dataImage.SetPointSource;
 import com.serotonin.mango.rt.dataImage.types.MangoValue;
 import com.serotonin.mango.rt.dataSource.PollingDataSource;
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class Alpha2DataSource extends PollingDataSource {
 
+	private static final Log LOG = LogFactory.getLog(Alpha2DataSource.class);
 	public static final int POINT_READ_EXCEPTION_EVENT = 1;
 	public static final int POINT_WRITE_EXCEPTION_EVENT = 2;
 	public static final int DATA_SOURCE_EXCEPTION_EVENT = 3;
@@ -65,6 +69,7 @@ protected void doPoll(long time) {
 					MangoValue value = MangoValue.stringToValue(deviceValue
 							.getValue(), rt.getDataTypeId());
 					rt.updatePointValue(new PointValueTime(value, time));
+					returnToNormal(POINT_READ_EXCEPTION_EVENT, time, rt);
 				}
 			}
 
@@ -131,18 +136,18 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 					master.runController();
 				else
 					master.stopController();
-			} else
+			} else {
 				master.write(devices);
-		} catch (Exception e) {
-			treatException(POINT_WRITE_EXCEPTION_EVENT, e, System
-					.currentTimeMillis());
+				returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+			}
+		} catch (Throwable e) {
+			treatException(POINT_WRITE_EXCEPTION_EVENT, e, System.currentTimeMillis(), dataPoint);
 		}
 
 	}
 
 	@Override
 	public void initialize() {
-		super.initialize();
 
 		SerialParameters parameters = new SerialParameters();
 		parameters.setBaudRate(vo.getBaudRate());
@@ -155,10 +160,13 @@ public void initialize() {
 		try {
 			master.init();
 			master.lineCheck();
-		} catch (Exception e) {
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
 			treatException(DATA_SOURCE_EXCEPTION_EVENT, e, System
 					.currentTimeMillis());
+			return;
 		}
+		super.initialize();
 
 	}
 
@@ -166,13 +174,19 @@ public void initialize() {
 	public void terminate() {
 		super.terminate();
 		try {
-			master.terminate();
-		} catch (Exception e) {
-			e.printStackTrace();
+			if(master != null)
+				master.terminate();
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this), e);
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
 		}
 	}
 
-	private void treatException(int exceptionType, Exception e, long time) {
+	private void treatException(int exceptionType, Throwable e, long time) {
+		LOG.warn(LoggingUtils.info(e, this), e);
 		if (e instanceof COMMException) {
 			raiseEvent(exceptionType, time, true, new LocalizableMessage(
 					"alpha2.commException", vo.getName(), e.getMessage()));
@@ -190,37 +204,22 @@ private void treatException(int exceptionType, Exception e, long time) {
 		}
 	}
 
-	// public static void main(String[] args) {
-	// List<String> lista = new ArrayList<String>();
-	//
-	// for (int i = 0; i < 250; i++) {
-	// lista.add("device " + i);
-	// }
-	//
-	// final int maxNum = 82;
-	// List<List<String>> messages = new ArrayList<List<String>>();
-	//
-	// int numMessages = lista.size() % maxNum == 0 ? ((int) (lista.size() /
-	// maxNum))
-	// : ((int) (lista.size() / maxNum)) + 1;
-	//
-	// for (int i = 0; i < numMessages; i++) {
-	// List<String> temp;
-	// if (i == numMessages - 1) {
-	// temp = lista.subList(0 + (i * (maxNum)), lista.size());
-	// } else {
-	// int init = 0 + (i * (maxNum));
-	// int end = (maxNum) + ((maxNum) * i);
-	// temp = lista.subList(init, end);
-	//
-	// }
-	// messages.add(temp);
-	// }
-	// System.out.println("Enviar " + messages.size() + " mensagens!");
-	// for (List<String> list : messages) {
-	// System.out.println("Mensagem: " + list.size());
-	// }
-	//
-	// }
-
+	private void treatException(int exceptionType, Throwable e, long time, DataPointRT dataPointRT) {
+		LOG.warn(LoggingUtils.info(e, this), e);
+		if (e instanceof COMMException) {
+			raiseEvent(exceptionType, time, true, new LocalizableMessage(
+					"alpha2.commException", vo.getName(), e.getMessage()), dataPointRT);
+		} else if (e instanceof InvalidFrameReceivedException) {
+			raiseEvent(exceptionType, time, true, new LocalizableMessage(
+					"alpha2.invalidFrameException", vo.getName(), e
+					.getMessage()), dataPointRT);
+		} else if (e instanceof ErrorMessageReceivedException) {
+			raiseEvent(exceptionType, time, true, new LocalizableMessage(
+					"alpha2.errorMessageException", vo.getName(), e
+					.getMessage()), dataPointRT);
+		} else {
+			raiseEvent(exceptionType, time, true, new LocalizableMessage(
+					"alpha2.unknownException", vo.getName(), e.getMessage()), dataPointRT);
+		}
+	}
 }
diff --git a/src/br/org/scadabr/rt/dataSource/asciiFile/ASCIIFileDataSource.java b/src/br/org/scadabr/rt/dataSource/asciiFile/ASCIIFileDataSource.java
index 3a5c220aa5..0255a7ed9c 100644
--- a/src/br/org/scadabr/rt/dataSource/asciiFile/ASCIIFileDataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/asciiFile/ASCIIFileDataSource.java
@@ -7,6 +7,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.serotonin.mango.util.LoggingUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -43,6 +44,7 @@ protected void doPoll(long time) {
 					new LocalizableMessage("event.exception2", vo.getName(),
 							"Arquivo não encontrado!"));
 		} else {
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, time);
 			String arquivo = readFile(file);
 
 			for (DataPointRT dataPoint : dataPoints) {
@@ -58,19 +60,21 @@ protected void doPoll(long time) {
 						} catch (Exception e) {
 							raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true,
 									new LocalizableMessage("event.exception2",
-											vo.getName(), e.getMessage()));
+											vo.getName(), e.getMessage()), dataPoint);
 							timestamp = time;
+							return;
 						}
 
 					}
 
 					dataPoint.updatePointValue(new PointValueTime(value,
 							timestamp));
+					returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
 				} catch (Exception e) {
+					LOG.error(LoggingUtils.info(e, this), e);
 					raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true,
 							new LocalizableMessage("event.exception2", vo
-									.getName(), e.getMessage()));
-					e.printStackTrace();
+									.getName(), e.getMessage()), dataPoint);
 				}
 
 			}
@@ -143,7 +147,7 @@ private String readFile(File file) {
 			} while (c != -1);
 			reader.close();
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.error(LoggingUtils.info(e, this), e);
 		}
 		return sb.toString();
 	}
diff --git a/src/br/org/scadabr/rt/dataSource/asciiSerial/ASCIISerialDataSource.java b/src/br/org/scadabr/rt/dataSource/asciiSerial/ASCIISerialDataSource.java
index 6a1968f973..5bae2f06ba 100644
--- a/src/br/org/scadabr/rt/dataSource/asciiSerial/ASCIISerialDataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/asciiSerial/ASCIISerialDataSource.java
@@ -1,5 +1,6 @@
 package br.org.scadabr.rt.dataSource.asciiSerial;
 
+import com.serotonin.mango.util.LoggingUtils;
 import gnu.io.CommPortIdentifier;
 import gnu.io.SerialPort;
 
@@ -26,6 +27,7 @@
 import com.serotonin.mango.rt.dataSource.DataSourceUtils;
 import com.serotonin.mango.rt.dataSource.PollingDataSource;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.scada_lts.serial.gnu.io.ScadaCommPortIdentifier;
 
 public class ASCIISerialDataSource extends PollingDataSource {
 
@@ -44,10 +46,6 @@ public ASCIISerialDataSource(ASCIISerialDataSourceVO<?> vo) {
 		setPollingPeriod(vo.getUpdatePeriodType(), vo.getUpdatePeriods(),
 				vo.isQuantize());
 
-		portList = CommPortIdentifier.getPortIdentifiers();
-		getPort(vo.getCommPortId());
-		configurePort(getsPort());
-
 	}
 
 	private boolean reconnect() {
@@ -55,7 +53,7 @@ private boolean reconnect() {
 		try {
 			while (true) {
 				Thread.sleep(5000);
-				portList = CommPortIdentifier.getPortIdentifiers();
+				portList = ScadaCommPortIdentifier.getPortIdentifiers();
 				SerialPort p = getPort(vo.getCommPortId());
 				if (p != null) {
 					configurePort(getsPort());
@@ -63,7 +61,8 @@ private boolean reconnect() {
 					return true;
 				}
 			}
-		} catch (Exception e) {
+		} catch (Throwable e) {
+			LOG.warn(LoggingUtils.info(e, this), e);
 			return false;
 		}
 
@@ -75,7 +74,7 @@ protected void doPoll(long time) {
 		try {
 
 			// nao tem dados
-			if (getInSerialStream().available() == 0) {
+			if (getInSerialStream() == null || getInSerialStream().available() == 0) {
 
 				for (DataPointRT dataPoint : dataPoints) {
 					ASCIISerialPointLocatorVO dataPointVO = dataPoint.getVO()
@@ -93,6 +92,7 @@ protected void doPoll(long time) {
 						new LocalizableMessage("event.exception2",
 								vo.getName(), "Sem dados disponíveis !"));
 			} else if (getInSerialStream().available() > 0) {
+				returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, time);
 				byte[] readBuffer = new byte[vo.getBufferSize()];
 				try {
 
@@ -176,7 +176,7 @@ protected void doPoll(long time) {
 											new LocalizableMessage(
 													"event.exception2", vo
 															.getName(), e
-															.getMessage()));
+															.getMessage()), dataPoint);
 									timestamp = time;
 								}
 
@@ -184,30 +184,49 @@ protected void doPoll(long time) {
 
 							dataPoint.updatePointValue(new PointValueTime(
 									value, timestamp));
+							returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
 						} catch (Exception e) {
+							LOG.warn(LoggingUtils.info(e, this), e);
 							raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true,
 									new LocalizableMessage("event.exception2",
-											vo.getName(), e.getMessage()));
+											vo.getName(), e.getMessage()), dataPoint);
 							// e.printStackTrace();
 						}
 
 					}
 
-				} catch (Exception e) {
+				} catch (Throwable e) {
+					LOG.warn(LoggingUtils.info(e, this), e);
 				}
 			}
 
 		} catch (IOException io) {
-			getsPort().close();
-			reconnect();
-		} catch (Exception e) {
+			LOG.warn(LoggingUtils.info(io, this), io);
+			try {
+				getsPort().close();
+				reconnect();
+			} catch (Throwable e) {
+				LOG.warn(LoggingUtils.info(io, this), e);
+			}
+		} catch (Throwable e) {
+			LOG.warn(LoggingUtils.info(e, this), e);
 		}
 	}
 
 	@Override
 	public void initialize() {
+		try {
+			portList = ScadaCommPortIdentifier.getPortIdentifiers();
+			getPort(vo.getCommPortId());
+			configurePort(getsPort());
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
+			return;
+		}
 		super.initialize();
-
 	}
 
 	private MangoValue getValue(ASCIISerialPointLocatorVO point, String arquivo)
@@ -260,7 +279,17 @@ private long getTimestamp(ASCIISerialPointLocatorVO point, String arquivo)
 	@Override
 	public void terminate() {
 		super.terminate();
-		getsPort().close();
+		try {
+			SerialPort serialPort = getsPort();
+			if(serialPort != null) {
+				serialPort.close();
+			}
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
+		}
 	}
 
 	@Override
@@ -274,7 +303,8 @@ public void configurePort(SerialPort port) {
 		try {
 			setInSerialStream(port.getInputStream());
 			setOutSerialStream(port.getOutputStream());
-		} catch (Exception e) {
+		} catch (Throwable e) {
+			LOG.warn(LoggingUtils.info(e, this), e);
 		}
 
 		port.notifyOnDataAvailable(true);
@@ -282,7 +312,8 @@ public void configurePort(SerialPort port) {
 		try {
 			port.setSerialPortParams(vo.getBaudRate(), vo.getDataBits(),
 					vo.getStopBits(), vo.getParity());
-		} catch (Exception e) {
+		} catch (Throwable e) {
+			LOG.warn(LoggingUtils.info(e, this), e);
 		}
 
 	}
@@ -298,8 +329,8 @@ public SerialPort getPort(String port) {
 						serialPort = (SerialPort) portId.open(this.getName(),
 								10000);
 						setsPort(serialPort);
-					} catch (Exception e) {
-						System.out.println("Erro ao abrir a porta !");
+					} catch (Throwable e) {
+						LOG.error("Erro ao abrir a porta ! :" + LoggingUtils.info(e, this));
 					}
 				}
 			}
diff --git a/src/br/org/scadabr/rt/dataSource/dnp3/DNP3Master.java b/src/br/org/scadabr/rt/dataSource/dnp3/DNP3Master.java
index 828acf6b10..39414d9715 100644
--- a/src/br/org/scadabr/rt/dataSource/dnp3/DNP3Master.java
+++ b/src/br/org/scadabr/rt/dataSource/dnp3/DNP3Master.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.serotonin.mango.util.LoggingUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -43,8 +44,10 @@ public void initSerial(int sourceAddress, int slaveAddress, String com,
 			user.init();
 		} catch (Error e) {
 			log.fatal(e.getMessage(), e);
+			throw e;
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			throw e;
 		}
 	}
 
@@ -52,18 +55,24 @@ public void initSerial(int sourceAddress, int slaveAddress, String com,
 
 	public void doPoll() throws Exception {
 		if (reconnecting) {
-			log.debug("[DNP3Master] Trying to reconnect...");
+			log.warn("[DNP3Master] Trying to reconnect...");
 			timeoutCount = 0;
 			try {
 				try {
 					user.init();
 					reconnecting = false;
-					log.debug("[DNP3Master] Reconnected!");
-				} catch (Exception | Error e) {
-					log.warn(e.getMessage(), e);
-					terminate();
+					log.warn("[DNP3Master] Reconnected!");
+				} catch (Throwable e) {
+					log.warn(LoggingUtils.exceptionInfo(e));
+					try {
+						terminate();
+					} catch (Throwable ex) {
+						log.warn(LoggingUtils.exceptionInfo(ex));
+						throw ex;
+					}
 				}
 			} catch (Exception e) {
+				log.error(LoggingUtils.exceptionInfo(e));
 				throw e;
 			}
 		} else {
@@ -72,10 +81,13 @@ public void doPoll() throws Exception {
 				log.debug("[DNP3Master] Conexão falhou. Terminar Conexão.");
 				terminate();
 				log.debug("[DNP3Master] Conexão terminada.");
-				throw new Exception("[DNP3Master] Poll failed!");
+                throw new Exception("[DNP3Master] Poll failed! User: " + this.user + ", pollingCount: " + this.pollingCount
+                        + ", relativePollingPeriod: " + this.relativePollingPeriod
+                        + ", timeoutCount: " + this.timeoutCount
+                        + ", reconnecting: " + this.reconnecting);
 			} else {
 				try {
-					log.debug("[DNP3Master] Poll " + pollingCount + " / "
+					log.warn("[DNP3Master] Poll " + pollingCount + " / "
 							+ relativePollingPeriod);
 					if (pollingCount == 0) {
 						user.sendSynch(user.buildReadStaticDataMsg());
@@ -87,10 +99,11 @@ public void doPoll() throws Exception {
 							pollingCount = 0;
 					}
 					timeoutCount = 0;
-				} catch (Exception e) {
-					log.debug("[DNP3Master] Poll failed! (Error: "
+				} catch (Throwable e) {
+					log.warn("[DNP3Master] Poll failed! (Error: "
 							+ e.getMessage() + ")");
 					timeoutCount++;
+					throw e;
 				}
 
 			}
diff --git a/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3DataSource.java b/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3DataSource.java
index 8a28831d8b..d74766a225 100644
--- a/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3DataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3DataSource.java
@@ -2,9 +2,9 @@
 
 import java.net.ConnectException;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
+import com.serotonin.mango.util.LoggingUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -21,12 +21,16 @@
 import com.serotonin.messaging.TimeoutException;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static com.serotonin.mango.rt.dataSource.DataSourceUtils.checkInitialized;
+
+
 public class Dnp3DataSource extends PollingDataSource {
 
 	private final Log LOG = LogFactory.getLog(Dnp3DataSource.class);
 
 	public static final int POINT_READ_EXCEPTION_EVENT = 1;
 	public static final int DATA_SOURCE_EXCEPTION_EVENT = 2;
+	public static final int POINT_WRITE_EXCEPTION_EVENT = 3;
 
 	private DNP3Master dnp3Master;
 	private final Dnp3DataSourceVO<?> vo;
@@ -42,13 +46,12 @@ public Dnp3DataSource(Dnp3DataSourceVO<?> vo) {
 	protected void doPoll(long time) {
 
 		try {
+			checkInitialized(dnp3Master, this);
 			dnp3Master.doPoll();
 			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, time);
-		} catch (Exception e) {
-			LOG.warn(e.getMessage(), e);
-			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, time, true,
-					new LocalizableMessage("event.exception2", vo.getName(), e
-							.getMessage()));
+		} catch (Throwable e) {
+			LOG.warn(LoggingUtils.info(e, this), e);
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, time, true, getLocalExceptionMessage(e));
 			return;
 		}
 
@@ -81,12 +84,12 @@ protected void initialize(DNP3Master dnp3Master) {
 	public void terminate() {
 		super.terminate();
 		try {
-			dnp3Master.terminate();
-		} catch (Exception e) {
-			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, new Date().getTime(), true,
-					new LocalizableMessage("event.exception2", vo.getName(), e
-							.getMessage()));
-			LOG.error(e.getMessage(), e);
+			if(dnp3Master != null)
+				dnp3Master.terminate();
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this), e);
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, getLocalExceptionMessage(e));
 		}
 	}
 
@@ -100,6 +103,7 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 		int index = pointLocator.getIndex();
 
 		try {
+			checkInitialized(dnp3Master, this);
 			if (dataType == 0x10) {
 				dnp3Master.controlCommand(valueTime.getValue().toString(),
 						index, pointLocator.getControlCommand(), pointLocator
@@ -108,12 +112,14 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 				dnp3Master
 						.sendAnalogCommand(index, valueTime.getIntegerValue());
 			}
-		} catch (Exception e) {
-			e.printStackTrace();
+			returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this), e);
+			raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true, getLocalExceptionMessage(e), dataPoint);
 		}
 	}
 
-	protected LocalizableMessage getLocalExceptionMessage(Exception e) {
+	protected LocalizableMessage getLocalExceptionMessage(Throwable e) {
 		if (e instanceof Exception) {
 			Throwable cause = e.getCause();
 			if (cause instanceof TimeoutException)
diff --git a/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3IpDataSource.java b/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3IpDataSource.java
index 1ae960efe9..f090d5fa5d 100644
--- a/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3IpDataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3IpDataSource.java
@@ -1,12 +1,16 @@
 package br.org.scadabr.rt.dataSource.dnp3;
 
-import java.util.Date;
 
 import br.org.scadabr.vo.dataSource.dnp3.Dnp3IpDataSourceVO;
 
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class Dnp3IpDataSource extends Dnp3DataSource {
+
+	private static final Log LOG = LogFactory.getLog(Dnp3IpDataSource.class);
 	private final Dnp3IpDataSourceVO configuration;
 
 	public Dnp3IpDataSource(Dnp3IpDataSourceVO configuration) {
@@ -23,11 +27,13 @@ public void initialize() {
 					configuration.getSlaveAddress(), configuration.getHost(),
 					configuration.getPort(), configuration
 							.getStaticPollPeriods());
-		} catch (Exception e) {
-			e.printStackTrace();
-			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, new Date().getTime(), true,
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this));
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
 					new LocalizableMessage("event.exception2", configuration
 							.getName(), e.getMessage()));
+			return;
 		}
 
 		super.initialize(dnp3Master);
diff --git a/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3SerialDataSource.java b/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3SerialDataSource.java
index 25524adbeb..a493f8d92b 100644
--- a/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3SerialDataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/dnp3/Dnp3SerialDataSource.java
@@ -1,5 +1,6 @@
 package br.org.scadabr.rt.dataSource.dnp3;
 
+import com.serotonin.mango.util.LoggingUtils;
 import gnu.io.NoSuchPortException;
 
 import java.util.Date;
@@ -8,8 +9,12 @@
 
 import com.serotonin.mango.rt.dataSource.DataSourceRT;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class Dnp3SerialDataSource extends Dnp3DataSource {
+
+	private static final Log LOG = LogFactory.getLog(Dnp3SerialDataSource.class);
 	private final Dnp3SerialDataSourceVO configuration;
 
 	public Dnp3SerialDataSource(Dnp3SerialDataSourceVO configuration) {
@@ -26,18 +31,18 @@ public void initialize() {
 					configuration.getSlaveAddress(), configuration
 							.getCommPortId(), configuration.getBaudRate(),
 					configuration.getStaticPollPeriods());
-		} catch (Exception e) {
-			e.printStackTrace();
-			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, new Date().getTime(), true,
-					new LocalizableMessage("event.exception2", configuration
-							.getName(), e.getMessage()));
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this));
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, new Date().getTime(), true, getLocalExceptionMessage(e));
+			return;
 		}
 
 		super.initialize(dnp3Master);
 	}
 
 	@Override
-	protected LocalizableMessage getLocalExceptionMessage(Exception e) {
+	protected LocalizableMessage getLocalExceptionMessage(Throwable e) {
 		if (e instanceof Exception) {
 			Throwable cause = e.getCause();
 			if (cause instanceof NoSuchPortException)
diff --git a/src/br/org/scadabr/rt/dataSource/drStorageHt5b/DrStorageHt5bDataSource.java b/src/br/org/scadabr/rt/dataSource/drStorageHt5b/DrStorageHt5bDataSource.java
index c72fa89441..7d87efceab 100644
--- a/src/br/org/scadabr/rt/dataSource/drStorageHt5b/DrStorageHt5bDataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/drStorageHt5b/DrStorageHt5bDataSource.java
@@ -1,5 +1,6 @@
 package br.org.scadabr.rt.dataSource.drStorageHt5b;
 
+import com.serotonin.mango.util.LoggingUtils;
 import gnu.io.CommPortIdentifier;
 import gnu.io.SerialPort;
 
@@ -19,10 +20,11 @@
 import com.serotonin.mango.rt.dataImage.SetPointSource;
 import com.serotonin.mango.rt.dataSource.PollingDataSource;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.scada_lts.serial.gnu.io.ScadaCommPortIdentifier;
 
 public class DrStorageHt5bDataSource extends PollingDataSource {
 
-	private final Log LOG = LogFactory.getLog(DrStorageHt5bDataSource.class);
+	private final static Log LOG = LogFactory.getLog(DrStorageHt5bDataSource.class);
 	public static final int POINT_READ_EXCEPTION_EVENT = 1;
 	public static final int DATA_SOURCE_EXCEPTION_EVENT = 2;
 	private final DrStorageHt5bDataSourceVO<?> vo;
@@ -39,11 +41,6 @@ public DrStorageHt5bDataSource(DrStorageHt5bDataSourceVO<?> vo) {
 		this.vo = vo;
 		setPollingPeriod(vo.getUpdatePeriodType(), vo.getUpdatePeriods(), vo
 				.isQuantize());
-
-		portList = CommPortIdentifier.getPortIdentifiers();
-		getPort(vo.getCommPortId());
-		configurePort(getsPort());
-		setValuesHt5b(new ArrayList<Integer>());
 	}
 
 	@Override
@@ -51,7 +48,7 @@ protected void doPoll(long time) {
 
 		try {
 
-			if (getInSerialStream().available() == 0) {
+			if (getInSerialStream() == null || getInSerialStream().available() == 0) {
 
 				raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, time, true,
 						new LocalizableMessage("event.exception2",
@@ -89,12 +86,13 @@ protected void doPoll(long time) {
 								dataPoint.updatePointValue(new PointValueTime(
 										hum, System.currentTimeMillis()));
 							}
-
+							returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
 						} catch (Exception e) {
+							LOG.error(LoggingUtils.info(e, this));
 							raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true,
 									new LocalizableMessage("event.exception2",
-											vo.getName(), e.getMessage()));
-							e.printStackTrace();
+											vo.getName(), e.getMessage()), dataPoint);
+
 						}
 
 					}
@@ -102,12 +100,12 @@ protected void doPoll(long time) {
 					getValuesHt5b().clear();
 
 				} catch (Exception e) {
-					e.printStackTrace();
+					LOG.error(LoggingUtils.info(e, this));
 				}
 			}
 
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.error(LoggingUtils.info(e, this));
 		}
 
 	}
@@ -122,7 +120,16 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 	@Override
 	public void terminate() {
 		super.terminate();
-		getsPort().close();
+		try {
+			SerialPort serialPort = getsPort();
+			if(serialPort != null)
+				serialPort.close();
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
+		}
 	}
 
 	private String getTemperature(ArrayList<Integer> ht5bValues) {
@@ -232,19 +239,22 @@ private void toStringHexa(byte[] bytes) {
 	}
 
 	public static String getHexString(byte[] b) throws Exception {
-		String result = "";
 
-		System.out.println("INICIO");
+		LOG.info("INICIO");
+
+		StringBuilder result = new StringBuilder("");
 
 		for (int i = 0; i < b.length; i++) {
-			System.out.println(Integer.toString((b[i] & 0xff) + 0x100, 16)
-					.substring(1));
-			result += Integer.toString((b[i] & 0xff) + 0x100, 16).substring(1);
+			String value = Integer.toString((b[i] & 0xff) + 0x100, 16)
+					.substring(1);
+			LOG.info(value);
+
+			result.append(value);
 		}
 
-		System.out.println("FIM");
+		LOG.info("FIN");
 
-		return result;
+		return result.toString();
 	}
 
 	public static String getHex(byte[] raw) {
@@ -292,9 +302,9 @@ public SerialPort getPort(String port) {
 						serialPort = (SerialPort) portId.open(this.getName(),
 								10000);
 						setsPort(serialPort);
-					} catch (Exception e) {
-						System.out.println("Error opening port "
-								+ serialPort.getName() + "!");
+					} catch (Throwable e) {
+						LOG.error("Error opening port " + serialPort.getName() + "! : "
+								+ LoggingUtils.info(e, this));
 					}
 				}
 			}
@@ -343,4 +353,20 @@ public void setsPort(SerialPort sPort) {
 		this.sPort = sPort;
 	}
 
+	@Override
+	public void initialize() {
+		try {
+			portList = ScadaCommPortIdentifier.getPortIdentifiers();
+			getPort(vo.getCommPortId());
+			configurePort(getsPort());
+			setValuesHt5b(new ArrayList<>());
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
+			return;
+		}
+		super.initialize();
+	}
 }
diff --git a/src/br/org/scadabr/rt/dataSource/iec101/IEC101DataSource.java b/src/br/org/scadabr/rt/dataSource/iec101/IEC101DataSource.java
index 9a324cf954..73d6cc0578 100644
--- a/src/br/org/scadabr/rt/dataSource/iec101/IEC101DataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/iec101/IEC101DataSource.java
@@ -4,6 +4,7 @@
 import java.util.Date;
 import java.util.List;
 
+import com.serotonin.mango.util.LoggingUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -38,12 +39,16 @@ public IEC101DataSource(IEC101DataSourceVO<?> vo) {
 	@Override
 	protected void doPoll(long time) {
 		try {
+			if(iec101Master == null)
+				throw new IllegalStateException("Data source is not initialized!");
 			iec101Master.doPoll();
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
 		} catch (Exception e) {
-			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, new Date().getTime(), true,
+			LOG.error(LoggingUtils.info(e, this));
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
 					new LocalizableMessage("event.exception2", vo.getName(), e
 							.getMessage()));
-			e.printStackTrace();
+			return;
 		}
 
 		for (DataPointRT dataPoint : dataPoints) {
@@ -58,8 +63,15 @@ protected void doPoll(long time) {
 						.getValue(), pointLocator.getDataTypeId());
 				Calendar ts = Calendar.getInstance();
 				ts.setTimeInMillis(dataElement.getTimestamp());
-				dataPoint.updatePointValue(new PointValueTime(value, ts
-						.getTimeInMillis()));
+				try {
+					dataPoint.updatePointValue(new PointValueTime(value, ts
+							.getTimeInMillis()));
+					returnToNormal(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+				} catch (Exception e) {
+					raiseEvent(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+							new LocalizableMessage("event.exception2", vo.getName(), e
+									.getMessage()), dataPoint);
+				}
 			}
 		}
 	}
@@ -85,11 +97,12 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 				iec101Master.setPointCommand(ioa, select, qualifier, valueTime
 						.getIntegerValue());
 			}
-		} catch (Exception e) {
-			raiseEvent(POINT_WRITE_EXCEPTION_EVENT, new Date().getTime(), true,
+			returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this, dataPoint), e);
+			raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
 					new LocalizableMessage("event.exception2", vo.getName(), e
-							.getMessage()));
-			e.printStackTrace();
+							.getMessage()), dataPoint);
 		}
 	}
 
@@ -112,11 +125,13 @@ protected void initialize(IEC101Master iec101Master) {
 		this.iec101Master = iec101Master;
 		try {
 			iec101Master.init(vo.getGiRelativePeriod());
-		} catch (Exception e) {
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this), e);
 			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, new Date().getTime(), true,
 					new LocalizableMessage("event.exception2", vo.getName(), e
 							.getMessage()));
-			e.printStackTrace();
+			return;
 		}
 		super.initialize();
 	}
@@ -125,12 +140,14 @@ protected void initialize(IEC101Master iec101Master) {
 	public void terminate() {
 		super.terminate();
 		try {
-			iec101Master.terminate();
-		} catch (Exception e) {
+			if(iec101Master != null)
+				iec101Master.terminate();
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this), e);
 			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, new Date().getTime(), true,
 					new LocalizableMessage("event.exception2", vo.getName(), e
 							.getMessage()));
-			e.printStackTrace();
 		}
 	}
 
diff --git a/src/br/org/scadabr/rt/dataSource/iec101/IEC101Master.java b/src/br/org/scadabr/rt/dataSource/iec101/IEC101Master.java
index d9c83c4568..8563d476f9 100644
--- a/src/br/org/scadabr/rt/dataSource/iec101/IEC101Master.java
+++ b/src/br/org/scadabr/rt/dataSource/iec101/IEC101Master.java
@@ -47,9 +47,11 @@ public void doPoll() throws Exception {
 					reconnecting = false;
 				} else {
 					terminate();
+					throw new Exception("Trying to reconnect failed.");
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
+				Thread.sleep(100);
+				throw e;
 			}
 
 		} else {
diff --git a/src/br/org/scadabr/rt/dataSource/nodaves7/NodaveS7DataSource.java b/src/br/org/scadabr/rt/dataSource/nodaves7/NodaveS7DataSource.java
index e3dc448a08..373dd7f27d 100644
--- a/src/br/org/scadabr/rt/dataSource/nodaves7/NodaveS7DataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/nodaves7/NodaveS7DataSource.java
@@ -7,6 +7,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.serotonin.mango.util.LoggingUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -66,7 +67,7 @@ protected void doPoll(long time) {
 						} catch (Exception e) {
 							raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true,
 									new LocalizableMessage("event.exception2",
-											vo.getName(), e.getMessage()));
+											vo.getName(), e.getMessage()), dataPoint);
 							timestamp = time;
 						}
 
@@ -74,14 +75,15 @@ protected void doPoll(long time) {
 
 					dataPoint.updatePointValue(new PointValueTime(value,
 							timestamp));
+					returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
 				} catch (Exception e) {
+					LOG.error(LoggingUtils.info(e, this, dataPoint));
 					raiseEvent(
 							POINT_READ_EXCEPTION_EVENT,
 							time,
 							true,
 							new LocalizableMessage("event.exception2", vo
-									.getName(), e.getMessage()));
-					e.printStackTrace();
+									.getName(), e.getMessage()), dataPoint);
 				}
 
 			}
@@ -138,37 +140,31 @@ private long getTimestamp(NodaveS7PointLocatorVO point, String arquivo)
 	public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 			SetPointSource source) {
 
-		System.out.println("WRITE datapoint to S7 :");
+		LOG.info("WRITE datapoint to S7 :");
 
-		System.out.println("Command: " + this.vo.getNodaveWriteBaseCmd());
+		LOG.info("Command: " + this.vo.getNodaveWriteBaseCmd());
 
-		System.out
-				.println("AREA "
+		LOG.info("AREA "
 						+ ((NodaveS7PointLocatorVO) dataPoint.getVO()
 								.getPointLocator()).getS7writeMemoryArea());
-		System.out
-				.println("DBNUM "
+		LOG.info("DBNUM "
 						+ ((NodaveS7PointLocatorVO) dataPoint.getVO()
 								.getPointLocator()).getS7writeDBNUM());
-		System.out
-				.println("BYTES "
+		LOG.info("BYTES "
 						+ ((NodaveS7PointLocatorVO) dataPoint.getVO()
 								.getPointLocator()).getS7writeBytesQty());
-		System.out
-				.println("STARTS "
+		LOG.info("STARTS "
 						+ ((NodaveS7PointLocatorVO) dataPoint.getVO()
 								.getPointLocator()).getS7writeStarts());
-		System.out
-				.println("BIT "
+		LOG.info("BIT "
 						+ ((NodaveS7PointLocatorVO) dataPoint.getVO()
 								.getPointLocator()).getS7writeBitOffset());
 
-		System.out
-				.println("TYPE "
+		LOG.info("TYPE "
 						+ ((NodaveS7PointLocatorVO) dataPoint.getVO()
 								.getPointLocator()).getDataType());
 
-		System.out.println(valueTime.toString());
+		LOG.info(valueTime.toString());
 
 		// datatype 1 => binario
 		// datatype 2 => multistate
@@ -210,7 +206,7 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 					break;
 				}
 			}
-			System.out.println("Writing binary - converted to " + converted);
+			LOG.info("Writing binary - converted to " + converted);
 
 		}
 
diff --git a/src/br/org/scadabr/rt/dataSource/opc/OPCDataSource.java b/src/br/org/scadabr/rt/dataSource/opc/OPCDataSource.java
index b2485dcabc..b3f84c3074 100644
--- a/src/br/org/scadabr/rt/dataSource/opc/OPCDataSource.java
+++ b/src/br/org/scadabr/rt/dataSource/opc/OPCDataSource.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.logging.Level;
 
+import com.serotonin.mango.util.LoggingUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jinterop.dcom.common.JISystem;
@@ -36,14 +37,11 @@ public OPCDataSource(OPCDataSourceVO<?> vo) {
 		this.vo = vo;
 		setPollingPeriod(vo.getUpdatePeriodType(), vo.getUpdatePeriods(),
 				vo.isQuantize());
-
-		this.opcMaster = new RealOPCMaster();
-		JISystem.getLogger().setLevel(Level.OFF);
 	}
 
 	@Override
 	protected void doPoll(long time) {
-		ArrayList<String> enabledTags = new ArrayList<String>();
+		ArrayList<String> enabledTags = new ArrayList<>();
 
 		for (DataPointRT dataPoint : dataPoints) {
 			OPCPointLocatorVO dataPointVO = dataPoint.getVO().getPointLocator();
@@ -53,7 +51,7 @@ protected void doPoll(long time) {
 		try {
 
 			if (timeoutCount >= timeoutsToReconnect) {
-				System.out.println("[OPC] Trying to reconnect !");
+				LOG.error("[OPC] Trying to reconnect ! :" + LoggingUtils.dataSourceInfo(this));
 				timeoutCount = 0;
 				initialize();
 			} else {
@@ -62,7 +60,8 @@ protected void doPoll(long time) {
 				returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, time);
 			}
 
-		} catch (Exception e) {
+		} catch (Throwable e) {
+			LOG.error("[OPC] Poll Failed ! :" + LoggingUtils.info(e, this));
 			raiseEvent(
 					DATA_SOURCE_EXCEPTION_EVENT,
 					time,
@@ -70,7 +69,7 @@ protected void doPoll(long time) {
 					new LocalizableMessage("event.exception2", vo.getName(), e
 							.getMessage()));
 			timeoutCount++;
-			System.out.println("[OPC] Poll Failed !");
+			return;
 		}
 
 		for (DataPointRT dataPoint : dataPoints) {
@@ -85,10 +84,11 @@ protected void doPoll(long time) {
 						dataPointVO.getDataTypeId());
 				dataPoint
 						.updatePointValue(new PointValueTime(mangoValue, time));
-			} catch (Exception e) {
+				returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
+			} catch (Throwable e) {
 				raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true,
 						new LocalizableMessage("event.exception2",
-								vo.getName(), e.getMessage()));
+								vo.getName(), e.getMessage()), dataPoint);
 			}
 		}
 	}
@@ -110,18 +110,28 @@ else if (dataPoint.getDataTypeId() == DataTypes.MULTISTATE)
 
 		try {
 			opcMaster.write(tag, value);
-		} catch (Exception e) {
+			returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+		} catch (Throwable e) {
+			LOG.error(LoggingUtils.info(e, this, dataPoint), e);
 			raiseEvent(
 					POINT_WRITE_EXCEPTION_EVENT,
 					System.currentTimeMillis(),
 					true,
 					new LocalizableMessage("event.exception2", vo.getName(), e
-							.getMessage()));
-			e.printStackTrace();
+							.getMessage()), dataPoint);
 		}
 	}
 
 	public void initialize() {
+		if(opcMaster != null) {
+            try {
+                opcMaster.terminate();
+            } catch (Exception e) {
+                LOG.warn(LoggingUtils.info(e, this));
+            }
+        }
+		this.opcMaster = new RealOPCMaster();
+		JISystem.getLogger().setLevel(Level.OFF);
 
 		opcMaster.setHost(vo.getHost());
 		opcMaster.setDomain(vo.getDomain());
@@ -134,7 +144,7 @@ public void initialize() {
 			opcMaster.init();
 			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT,
 					System.currentTimeMillis());
-		} catch (Exception e) {
+		} catch (Throwable e) {
 			String message = e.getMessage();
 			if(e.getMessage() != null && e.getMessage().contains("Unknown Error")) {
 				message = "The OPC DA Server for the data source settings may not be found. ";
@@ -155,8 +165,10 @@ public void initialize() {
 	public void terminate() {
 		super.terminate();
 		try {
-			opcMaster.terminate();
-		} catch (Exception e) {
+			if(opcMaster != null)
+				opcMaster.terminate();
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
 			String message = e.getMessage();
 			if(e instanceof NullPointerException) {
 				message = "The client may not have been properly initialized. ";
diff --git a/src/br/org/scadabr/rt/scripting/ContextualizedScriptRT.java b/src/br/org/scadabr/rt/scripting/ContextualizedScriptRT.java
index 73209e9e01..267628976a 100644
--- a/src/br/org/scadabr/rt/scripting/ContextualizedScriptRT.java
+++ b/src/br/org/scadabr/rt/scripting/ContextualizedScriptRT.java
@@ -81,8 +81,8 @@ public void execute() throws ScriptException {
 
 			try {
 				context = new ScriptExecutor().convertContext(((ContextualizedScriptVO) vo).getPointsOnContext());
-			} catch (DataPointStateException e1) {
-				LOG.error("Data Point State Exception" + e1.getMessage());
+			} catch (Exception e1) {
+				LOG.error("Data Point State Exception " + e1.getMessage());
 				if (vo != null) {
 					throw new ScriptException("xid:"+vo.getXid() +" script:"+vo.getScript()+" error:" + e1.getMessage());
 				} else {
diff --git a/src/br/org/scadabr/view/component/AlarmListComponent.java b/src/br/org/scadabr/view/component/AlarmListComponent.java
index b60cb78fc8..7ba5fddb6c 100644
--- a/src/br/org/scadabr/view/component/AlarmListComponent.java
+++ b/src/br/org/scadabr/view/component/AlarmListComponent.java
@@ -18,6 +18,7 @@
 import com.serotonin.mango.view.ImplDefinition;
 import com.serotonin.mango.web.dwr.BaseDwr;
 import org.scada_lts.mango.service.EventService;
+import org.scada_lts.mango.service.SystemSettingsService;
 
 @JsonRemoteEntity
 public class AlarmListComponent extends CustomComponent {
@@ -37,6 +38,7 @@ public class AlarmListComponent extends CustomComponent {
 	private boolean hideTimestampColumn = false;
 	private boolean hideInactivityColumn = true;
 	private boolean hideAckColumn = false;
+	private boolean hideAssigneeColumn = false;
 
 	public AlarmListComponent() {}
 
@@ -50,15 +52,18 @@ private AlarmListComponent(AlarmListComponent alarmListComponent) {
 		this.hideTimestampColumn = alarmListComponent.isHideTimestampColumn();
 		this.hideInactivityColumn = alarmListComponent.isHideInactivityColumn();
 		this.hideAckColumn = alarmListComponent.isHideAckColumn();
+		this.hideAssigneeColumn = alarmListComponent.isHideAssigneeColumn();
 	}
 
 	@Override
 	public String generateContent() {
+		SystemSettingsService systemSettingsService = new SystemSettingsService();
 		Map<String, Object> model = new HashMap<String, Object>();
 		WebContext webContext = WebContextFactory.get();
 		HttpServletRequest request = webContext.getHttpServletRequest();
 		List<EventInstance> toViewEvents = new EventService().getPendingEventsAlarmLevelMin(Common
 				.getUser().getId(), minAlarmLevel, maxListSize);
+		boolean eventAssignEnabled = systemSettingsService.isEventAssignEnabled();
 
 		model.put("nome", "marlon");
 		model.put("events",toViewEvents);
@@ -68,6 +73,8 @@ public String generateContent() {
 		model.put("hideTimestampColumn", hideTimestampColumn);
 		model.put("hideInactivityColumn", hideInactivityColumn);
 		model.put("hideAckColumn", hideAckColumn);
+		model.put("hideAssigneeColumn", hideAssigneeColumn);
+		model.put("isEventAssignEnabled", eventAssignEnabled);
 
 		String content = BaseDwr.generateContent(request, "alarmList.jsp",
 				model);
@@ -137,13 +144,21 @@ public void setHideInactivityColumn(boolean hideInactivityColumn) {
 		this.hideInactivityColumn = hideInactivityColumn;
 	}
 
+	public boolean isHideAssigneeColumn() {
+		return hideAssigneeColumn;
+	}
+
+	public void setHideAssigneeColumn(boolean hideAssigneeColumn) {
+		this.hideAssigneeColumn = hideAssigneeColumn;
+	}
+
 	@Override
 	public ViewComponent copy() {
 		return new AlarmListComponent(this);
 	}
 
 	private static final long serialVersionUID = -1;
-	private static final int version = 1;
+	private static final int version = 2;
 
 	private void writeObject(ObjectOutputStream out) throws IOException {
 		out.writeInt(version);
@@ -155,6 +170,7 @@ private void writeObject(ObjectOutputStream out) throws IOException {
 		out.writeBoolean(hideTimestampColumn);
 		out.writeBoolean(hideInactivityColumn);
 		out.writeBoolean(hideAckColumn);
+		out.writeBoolean(hideAssigneeColumn);
 
 	}
 
@@ -171,6 +187,16 @@ private void readObject(ObjectInputStream in) throws IOException {
 			hideTimestampColumn = in.readBoolean();
 			hideInactivityColumn = in.readBoolean();
 			hideAckColumn = in.readBoolean();
+		} else if (ver == 2) {
+			minAlarmLevel = in.readInt();
+			maxListSize = in.readInt();
+			width = in.readInt();
+			hideIdColumn = in.readBoolean();
+			hideAlarmLevelColumn = in.readBoolean();
+			hideTimestampColumn = in.readBoolean();
+			hideInactivityColumn = in.readBoolean();
+			hideAckColumn = in.readBoolean();
+			hideAssigneeColumn = in.readBoolean();
 		}
 
 	}
@@ -197,12 +223,12 @@ public boolean equals(Object o) {
 		if (!(o instanceof AlarmListComponent)) return false;
 		if (!super.equals(o)) return false;
 		AlarmListComponent that = (AlarmListComponent) o;
-		return getMinAlarmLevel() == that.getMinAlarmLevel() && getMaxListSize() == that.getMaxListSize() && getWidth() == that.getWidth() && isHideIdColumn() == that.isHideIdColumn() && isHideAlarmLevelColumn() == that.isHideAlarmLevelColumn() && isHideTimestampColumn() == that.isHideTimestampColumn() && isHideInactivityColumn() == that.isHideInactivityColumn() && isHideAckColumn() == that.isHideAckColumn();
+		return getMinAlarmLevel() == that.getMinAlarmLevel() && getMaxListSize() == that.getMaxListSize() && getWidth() == that.getWidth() && isHideIdColumn() == that.isHideIdColumn() && isHideAlarmLevelColumn() == that.isHideAlarmLevelColumn() && isHideTimestampColumn() == that.isHideTimestampColumn() && isHideInactivityColumn() == that.isHideInactivityColumn() && isHideAckColumn() == that.isHideAckColumn() && isHideAssigneeColumn() == that.isHideAssigneeColumn();
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(super.hashCode(), getMinAlarmLevel(), getMaxListSize(), getWidth(), isHideIdColumn(), isHideAlarmLevelColumn(), isHideTimestampColumn(), isHideInactivityColumn(), isHideAckColumn());
+		return Objects.hash(super.hashCode(), getMinAlarmLevel(), getMaxListSize(), getWidth(), isHideIdColumn(), isHideAlarmLevelColumn(), isHideTimestampColumn(), isHideInactivityColumn(), isHideAckColumn(), isHideAssigneeColumn());
 	}
 
 
@@ -217,6 +243,7 @@ public String toString() {
 				", hideTimestampColumn=" + hideTimestampColumn +
 				", hideInactivityColumn=" + hideInactivityColumn +
 				", hideAckColumn=" + hideAckColumn +
-				"} " + super.toString();
+				", hideAssigneeColumn=" + hideAssigneeColumn +
+				'}';
 	}
 }
diff --git a/src/br/org/scadabr/view/component/ChartComparatorComponent.java b/src/br/org/scadabr/view/component/ChartComparatorComponent.java
index ec11fbcc88..b469631a2f 100644
--- a/src/br/org/scadabr/view/component/ChartComparatorComponent.java
+++ b/src/br/org/scadabr/view/component/ChartComparatorComponent.java
@@ -22,6 +22,9 @@
 import org.scada_lts.dao.model.ScadaObjectIdentifier;
 import org.scada_lts.permissions.service.GetDataPointsWithAccess;
 
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
+
+
 @JsonRemoteEntity
 public class ChartComparatorComponent extends HtmlComponent {
 	public static ImplDefinition DEFINITION = new ImplDefinition(
@@ -113,7 +116,7 @@ private String createDataPointsSelectComponent(String idPrefix, List<ScadaObject
 		sb.append("<option value='0'> &nbsp; </option>");
 
 		for (ScadaObjectIdentifier dp : dataPoints) {
-			sb.append("<option value='" + dp.getId() + "'> " + dp.getName()
+			sb.append("<option value='" + dp.getId() + "'> " + escapeHtml(dp.getName())
 					+ "</option>");
 		}
 		sb.append("</select>");
@@ -135,10 +138,10 @@ private String createDateRangeComponent(String idPrefix, String fromDateId,
 		sb.append("<table>");
 		sb.append("<tr> <td> De </td> <td> A </td> </tr>");
 		sb.append("<tr> <td><input type='text' class='formField' id='"
-				+ fromDateId + "' value='" + defaultFromDateString
+				+ escapeHtml(fromDateId) + "' value='" + escapeHtml(defaultFromDateString)
 				+ "'/> </td> "
-				+ "<td> <input type='text' class='formField' id='" + toDateId
-				+ "' value='" + defaultToDateString + "'/> </td> </tr>");
+				+ "<td> <input type='text' class='formField' id='" + escapeHtml(toDateId)
+				+ "' value='" + escapeHtml(defaultToDateString) + "'/> </td> </tr>");
 		sb.append("</table>");
 		return sb.toString();
 	}
diff --git a/src/br/org/scadabr/view/component/LinkComponent.java b/src/br/org/scadabr/view/component/LinkComponent.java
index 258e7cff04..125b611b41 100644
--- a/src/br/org/scadabr/view/component/LinkComponent.java
+++ b/src/br/org/scadabr/view/component/LinkComponent.java
@@ -12,6 +12,8 @@
 import com.serotonin.mango.view.component.ViewComponent;
 import com.serotonin.util.SerializationHelper;
 
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
+
 @JsonRemoteEntity
 public class LinkComponent extends HtmlComponent {
 	public static ImplDefinition DEFINITION = new ImplDefinition("link",
@@ -48,8 +50,8 @@ private void createLink() {
 
 	public String createLinkContent() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("<a href='" + link + "'>");
-		sb.append(text);
+		sb.append("<a href='" + escapeHtml(link) + "'>");
+		sb.append(escapeHtml(text));
 		sb.append("</a>");
 		return sb.toString();
 	}
diff --git a/src/br/org/scadabr/view/component/ScriptButtonComponent.java b/src/br/org/scadabr/view/component/ScriptButtonComponent.java
index 7965ffdd06..16757688fa 100644
--- a/src/br/org/scadabr/view/component/ScriptButtonComponent.java
+++ b/src/br/org/scadabr/view/component/ScriptButtonComponent.java
@@ -12,6 +12,8 @@
 import com.serotonin.mango.view.component.ViewComponent;
 import com.serotonin.util.SerializationHelper;
 
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
+
 @JsonRemoteEntity
 public class ScriptButtonComponent extends HtmlComponent {
 	public static ImplDefinition DEFINITION = new ImplDefinition(
@@ -48,9 +50,9 @@ private void createScriptButton() {
 
 	public String createScriptButtonContent() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("<button class='viewComponent' onclick='mango.view.executeScript(\"" + scriptXid
+		sb.append("<button class='viewComponent' onclick='mango.view.executeScript(\"" + escapeHtml(scriptXid)
 				+ "\");'>");
-		sb.append(text);
+		sb.append(escapeHtml(text));
 		sb.append("</button>");
 		return sb.toString();
 	}
diff --git a/src/br/org/scadabr/vo/dataSource/dnp3/Dnp3DataSourceVO.java b/src/br/org/scadabr/vo/dataSource/dnp3/Dnp3DataSourceVO.java
index dcb5a37649..f2ba25cde4 100644
--- a/src/br/org/scadabr/vo/dataSource/dnp3/Dnp3DataSourceVO.java
+++ b/src/br/org/scadabr/vo/dataSource/dnp3/Dnp3DataSourceVO.java
@@ -33,6 +33,9 @@ protected void addEventTypes(List<EventTypeVO> eventTypes) {
 		eventTypes.add(createEventType(
 				Dnp3DataSource.DATA_SOURCE_EXCEPTION_EVENT,
 				new LocalizableMessage("event.ds.dataSource")));
+		eventTypes.add(createEventType(
+				Dnp3DataSource.POINT_WRITE_EXCEPTION_EVENT,
+				new LocalizableMessage("event.ds.pointWrite")));
 	}
 
 	private static final ExportCodes EVENT_CODES = new ExportCodes();
@@ -41,6 +44,8 @@ protected void addEventTypes(List<EventTypeVO> eventTypes) {
 				"DATA_SOURCE_EXCEPTION");
 		EVENT_CODES.addElement(Dnp3DataSource.POINT_READ_EXCEPTION_EVENT,
 				"POINT_READ_EXCEPTION");
+		EVENT_CODES.addElement(Dnp3DataSource.POINT_WRITE_EXCEPTION_EVENT,
+				"POINT_WRITE_EXCEPTION");
 	}
 
 	@Override
diff --git a/src/br/org/scadabr/vo/dataSource/drStorageHt5b/DrStorageHt5bDataSourceVO.java b/src/br/org/scadabr/vo/dataSource/drStorageHt5b/DrStorageHt5bDataSourceVO.java
index 78959fe38d..3c1e68168b 100644
--- a/src/br/org/scadabr/vo/dataSource/drStorageHt5b/DrStorageHt5bDataSourceVO.java
+++ b/src/br/org/scadabr/vo/dataSource/drStorageHt5b/DrStorageHt5bDataSourceVO.java
@@ -108,7 +108,6 @@ public com.serotonin.mango.vo.dataSource.DataSourceVO.Type getType() {
 	@JsonRemoteProperty
 	private boolean quantize;
 
-	@JsonRemoteProperty
 	@Override
 	public void validate(DwrResponseI18n response) {
 		super.validate(response);
diff --git a/src/br/org/scadabr/vo/exporter/util/FileUtil.java b/src/br/org/scadabr/vo/exporter/util/FileUtil.java
index 5d27bf4ef2..9cbcd37eec 100644
--- a/src/br/org/scadabr/vo/exporter/util/FileUtil.java
+++ b/src/br/org/scadabr/vo/exporter/util/FileUtil.java
@@ -1,5 +1,9 @@
 package br.org.scadabr.vo.exporter.util;
 
+import com.serotonin.mango.util.LoggingUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -7,6 +11,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -15,6 +20,8 @@
 import java.util.zip.ZipOutputStream;
 
 public class FileUtil {
+
+	private static final Log LOG = LogFactory.getLog(FileUtil.class);
 	private static final int BUFFER_SIZE = 2048;
 	private static final String FILE_SEPARATOR = System
 			.getProperty("file.separator");
@@ -22,33 +29,27 @@ public class FileUtil {
 	public static void compactFiles(OutputStream os, FileToPack[] files) {
 		int cont;
 		byte[] data = new byte[BUFFER_SIZE];
-		BufferedInputStream origin = null;
-		FileInputStream inputStream = null;
-		ZipOutputStream output = null;
-		ZipEntry entry = null;
-		try {
-			output = new ZipOutputStream(new BufferedOutputStream(os));
+
+		try (ZipOutputStream output = new ZipOutputStream(new BufferedOutputStream(os))) {
 			for (FileToPack file : files) {
 				if (file.getFile().isFile()) {
-					inputStream = new FileInputStream(file.getFile());
-					origin = new BufferedInputStream(inputStream, BUFFER_SIZE);
-					entry = new ZipEntry(file.getFileNameWhenPacked());
-					try {
-						output.putNextEntry(entry);
-					} catch (Exception e) {
-						continue;
-					}
-					while ((cont = origin.read(data, 0, BUFFER_SIZE)) != -1) {
-						output.write(data, 0, cont);
+					try (FileInputStream inputStream = new FileInputStream(file.getFile());
+						 BufferedInputStream origin = new BufferedInputStream(inputStream, BUFFER_SIZE)) {
+						ZipEntry entry = new ZipEntry(file.getFileNameWhenPacked());
+						try {
+							output.putNextEntry(entry);
+						} catch (Exception e) {
+							continue;
+						}
+						while ((cont = origin.read(data, 0, BUFFER_SIZE)) != -1) {
+							output.write(data, 0, cont);
+						}
 					}
-					origin.close();
 				}
 			}
-			output.close();
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.error(LoggingUtils.exceptionInfo(e), e);
 		}
-
 	}
 
 	public static File createTxtTempFile(String text) {
@@ -62,11 +63,18 @@ public static File createTxtTempFile(String text) {
 			file.deleteOnExit();
 			return file;
 		} catch (IOException e) {
-			e.printStackTrace();
+			LOG.error(LoggingUtils.exceptionInfo(e), e);
 		}
 		return file;
 	}
 
+	public static File createSvgTempFile(String xmlContent) throws IOException {
+		File temp = File.createTempFile("" + System.currentTimeMillis(), ".svg");
+		temp.deleteOnExit();
+		Files.writeString(temp.toPath(), xmlContent);
+		return temp;
+	}
+
 	public static List<File> getFilesOnDirectory(Path directoryName) {
 		List<File> files = new ArrayList<>();
 		try {
@@ -87,7 +95,7 @@ public static List<File> getFilesOnDirectory(Path directoryName) {
 				}
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.error(LoggingUtils.exceptionInfo(e), e);
 		}
 		return files;
 	}
diff --git a/src/br/org/scadabr/vo/scripting/ContextualizedScriptVO.java b/src/br/org/scadabr/vo/scripting/ContextualizedScriptVO.java
index 96551ccbaf..16f7723b4b 100644
--- a/src/br/org/scadabr/vo/scripting/ContextualizedScriptVO.java
+++ b/src/br/org/scadabr/vo/scripting/ContextualizedScriptVO.java
@@ -23,8 +23,13 @@
 import com.serotonin.mango.util.ChangeComparable;
 import com.serotonin.mango.util.LocalizableJsonException;
 import com.serotonin.mango.vo.DataPointVO;
+import com.serotonin.util.StringUtils;
+import com.serotonin.web.dwr.DwrResponseI18n;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static org.scada_lts.utils.ValidationDwrUtils.validateVarNameScript;
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
+
 @JsonRemoteEntity
 public class ContextualizedScriptVO extends ScriptVO<ContextualizedScriptVO>
 		implements ChangeComparable<ContextualizedScriptVO> {
@@ -38,6 +43,54 @@ public br.org.scadabr.vo.scripting.ScriptVO.Type getType() {
 	private List<IntValuePair> pointsOnContext = new ArrayList<IntValuePair>();
 	private List<IntValuePair> objectsOnContext = new ArrayList<IntValuePair>();
 
+	public void validate(DwrResponseI18n response) {
+
+		List<String> varNameSpace = new ArrayList<String>();
+		for (IntValuePair point : pointsOnContext) {
+			String varName = point.getValue();
+
+			if (StringUtils.isEmpty(varName)) {
+				response.addContextualMessage("context", "validate.allVarNames");
+				break;
+			}
+
+			if (!validateVarNameScript(varName)) {
+				response.addContextualMessage("context", "validate.invalidVarName", escapeHtml(varName));
+				break;
+			}
+
+			if (varNameSpace.contains(varName)) {
+				response.addContextualMessage("context", "validate.duplicateVarName", escapeHtml(varName));
+				break;
+			}
+
+			varNameSpace.add(escapeHtml(varName));
+		}
+
+		for (IntValuePair point : objectsOnContext) {
+			String varName = point.getValue();
+
+			if (StringUtils.isEmpty(varName)) {
+				response.addContextualMessage("context", "validate.allVarNames");
+				break;
+			}
+
+			if (!validateVarNameScript(varName)) {
+				response.addContextualMessage("context", "validate.invalidVarName", escapeHtml(varName));
+				break;
+			}
+
+			if (varNameSpace.contains(varName)) {
+				response.addContextualMessage("context", "validate.duplicateVarName", escapeHtml(varName));
+				break;
+			}
+
+			varNameSpace.add(escapeHtml(varName));
+		}
+
+		super.validate(response);
+	}
+
 	//
 	// /
 	// / Serialization
diff --git a/src/br/org/scadabr/web/dwr/ScriptsDwr.java b/src/br/org/scadabr/web/dwr/ScriptsDwr.java
index 194e5d8306..0510579eff 100644
--- a/src/br/org/scadabr/web/dwr/ScriptsDwr.java
+++ b/src/br/org/scadabr/web/dwr/ScriptsDwr.java
@@ -8,7 +8,6 @@
 
 import com.serotonin.db.IntValuePair;
 import com.serotonin.mango.Common;
-import com.serotonin.mango.db.dao.DataPointDao;
 import com.serotonin.mango.vo.DataPointExtendedNameComparator;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.permission.Permissions;
@@ -16,6 +15,7 @@
 import com.serotonin.web.dwr.DwrResponseI18n;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.mango.service.DataPointService;
 import org.scada_lts.mango.service.ScriptService;
 
 import static com.serotonin.mango.util.LoggingScriptUtils.infoErrorExecutionScript;
@@ -25,8 +25,9 @@ public class ScriptsDwr extends BaseDwr {
 	private static final Log LOG = LogFactory.getLog(ScriptsDwr.class);
 
 
-	public List<DataPointVO> getPoints() {
-		List<DataPointVO> allPoints = new DataPointDao().getDataPoints(
+	@Deprecated(since = "2.8.0")
+	public List<DataPointVO> getPoints1() {
+		List<DataPointVO> allPoints = new DataPointService().getDataPoints(
 				DataPointExtendedNameComparator.instance, false);
 		return allPoints;
 	}
diff --git a/src/cc/radiuino/scadabr/rt/datasource/radiuino/RadiuinoEventDataSource.java b/src/cc/radiuino/scadabr/rt/datasource/radiuino/RadiuinoEventDataSource.java
index 89fd53225b..41fafeca42 100644
--- a/src/cc/radiuino/scadabr/rt/datasource/radiuino/RadiuinoEventDataSource.java
+++ b/src/cc/radiuino/scadabr/rt/datasource/radiuino/RadiuinoEventDataSource.java
@@ -1,5 +1,6 @@
 package cc.radiuino.scadabr.rt.datasource.radiuino;
 
+import com.serotonin.mango.util.LoggingUtils;
 import gnu.io.CommPortIdentifier;
 import gnu.io.SerialPort;
 import gnu.io.SerialPortEvent;
@@ -25,6 +26,7 @@
 import com.serotonin.mango.rt.dataImage.SetPointSource;
 import com.serotonin.mango.rt.dataSource.EventDataSource;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.scada_lts.serial.gnu.io.ScadaCommPortIdentifier;
 
 public class RadiuinoEventDataSource extends EventDataSource implements
 		SerialPortEventListener {
@@ -57,7 +59,7 @@ private boolean reconnect() {
 		try {
 			while (true) {
 				Thread.sleep(5000);
-				portList = CommPortIdentifier.getPortIdentifiers();
+				portList = ScadaCommPortIdentifier.getPortIdentifiers();
 				SerialPort p = getPort(vo.getCommPortId(), vo.getTimeout());
 				if (p != null) {
 					LOG.debug("Conexao estabelecida com a porta serial");
@@ -66,8 +68,8 @@ private boolean reconnect() {
 					return true;
 				}
 			}
-		} catch (Exception e) {
-			LOG.error("Erro ao conectar na porta serial", e);
+		} catch (Throwable e) {
+			LOG.error("Erro ao conectar na porta serial: " + LoggingUtils.info(e, this));
 			return false;
 		}
 
@@ -75,19 +77,37 @@ private boolean reconnect() {
 
 	@Override
 	public void initialize() {
-		super.initialize();
 
 		LOG.debug("Inicializando o Radiuino Polling Data Source.");
 
-		portList = CommPortIdentifier.getPortIdentifiers();
-		getPort(vo.getCommPortId(), vo.getTimeout());
-		configurePort(getsPort());
+		try {
+			portList = ScadaCommPortIdentifier.getPortIdentifiers();
+			getPort(vo.getCommPortId(), vo.getTimeout());
+			configurePort(getsPort());
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
+			return;
+		}
+
+		super.initialize();
 	}
 
 	@Override
 	public void terminate() {
 		super.terminate();
-		getsPort().close();
+		try {
+			SerialPort serialPort = getsPort();
+			if(serialPort != null)
+				serialPort.close();
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
+		}
 
 		LOG.debug("Terminando o Radiuino Polling Data Source.");
 	}
@@ -155,11 +175,15 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 			enviarPacote(pacoteEnvio, 1);
 
 		} catch (IOException io) {
-			LOG.error("Erro ao setar valor no data point Radiuino.", io);
-			getsPort().close();
-			reconnect();
+			LOG.error("Erro ao setar valor no data point Radiuino: " + LoggingUtils.info(io, this));
+			try {
+				getsPort().close();
+				reconnect();
+			} catch (Throwable e) {
+				LOG.error(LoggingUtils.info(e, this));
+			}
 		} catch (Exception e) {
-			LOG.error("Erro geral ao setar valor no datasource.", e);
+			LOG.error("Erro geral ao setar valor no datasource: " + LoggingUtils.info(e, this));
 		}
 
 	}
@@ -197,8 +221,7 @@ private void enviarPacote(final byte[] pacoteEnvio, final int retries)
 					try {
 						Thread.sleep(100);
 					} catch (InterruptedException e) {
-						LOG.error("Erro ao aguardar por pacote.", e);
-						e.printStackTrace();
+						LOG.error("Erro ao aguardar por pacote: " + LoggingUtils.info(e, this), e);
 					}
 				} while ((new Date().getTime() - startTime) < timeout);
 				LOG.debug("Ainda esperando pacote " + new Date().getTime());
@@ -220,7 +243,7 @@ private void configurePort(SerialPort port) {
 			setInSerialStream(port.getInputStream());
 			setOutSerialStream(port.getOutputStream());
 		} catch (Exception e) {
-			LOG.error("Erro ao configurar streaming de in e out", e);
+			LOG.error("Erro ao configurar streaming de in e out: " + LoggingUtils.info(e, this));
 		}
 
 		port.notifyOnDataAvailable(true);
@@ -228,16 +251,16 @@ private void configurePort(SerialPort port) {
 			port.addEventListener(this);
 			port.enableReceiveTimeout(vo.getTimeout());
 		} catch (UnsupportedCommOperationException e1) {
-			LOG.error("Comando nao suportado ao abrir a porta serial.", e1);
+			LOG.error("Comando nao suportado ao abrir a porta serial: " + LoggingUtils.info(e1, this));
 		} catch (TooManyListenersException e) {
-			LOG.error("Muitos Listeners adicionados a porta serial", e);
+			LOG.error("Muitos Listeners adicionados a porta serial: " + LoggingUtils.info(e, this));
 		}
 
 		try {
 			port.setSerialPortParams(vo.getBaudRate(), vo.getDataBits(),
 					vo.getStopBits(), vo.getParity());
 		} catch (Exception e) {
-			LOG.error("Erro ao setar parametros da porta serial", e);
+			LOG.error("Erro ao setar parametros da porta serial: " + LoggingUtils.info(e, this));
 		}
 
 	}
@@ -255,7 +278,7 @@ private SerialPort getPort(String port, int timeout) {
 								timeout);
 						setsPort(serialPort);
 					} catch (Exception e) {
-						LOG.error("Erro ao abrir a porta serial.", e);
+						LOG.error("Erro ao abrir a porta serial: " + LoggingUtils.info(e, this));
 					}
 				}
 			}
@@ -305,7 +328,7 @@ public void serialEvent(SerialPortEvent serialPortEvent) {
 					pacoteRecebido();
 				}
 			} catch (IOException e) {
-				LOG.error("Erro ao receber dados da porta serial", e);
+				LOG.error("Erro ao receber dados da porta serial: " + LoggingUtils.info(e, this));
 			}
 
 		default:
@@ -326,14 +349,15 @@ private void pacoteRecebido() {
 							.parsePacoteRadiuino(time, pacote, dataPointVO);
 					if (pointValueTime != null)
 						dataPoint.updatePointValue(pointValueTime);
+					returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
 				} catch (Exception e) {
-					LOG.error("Erro ao fazer o parse dos dados.", e);
+					LOG.error("Erro ao fazer o parse dos dados: " + LoggingUtils.info(e, this, dataPoint));
 					raiseEvent(
 							POINT_READ_EXCEPTION_EVENT,
 							time,
 							true,
 							new LocalizableMessage("event.exception2", vo
-									.getName(), e.getMessage()));
+									.getName(), e.getMessage()), dataPoint);
 				}
 
 			}
diff --git a/src/cc/radiuino/scadabr/rt/datasource/radiuino/RadiuinoPollingDataSource.java b/src/cc/radiuino/scadabr/rt/datasource/radiuino/RadiuinoPollingDataSource.java
index ab30f6a672..ce7a8d2324 100644
--- a/src/cc/radiuino/scadabr/rt/datasource/radiuino/RadiuinoPollingDataSource.java
+++ b/src/cc/radiuino/scadabr/rt/datasource/radiuino/RadiuinoPollingDataSource.java
@@ -1,5 +1,6 @@
 package cc.radiuino.scadabr.rt.datasource.radiuino;
 
+import com.serotonin.mango.util.LoggingUtils;
 import gnu.io.CommPortIdentifier;
 import gnu.io.SerialPort;
 import gnu.io.SerialPortEvent;
@@ -27,6 +28,7 @@
 import com.serotonin.mango.rt.dataImage.SetPointSource;
 import com.serotonin.mango.rt.dataSource.PollingDataSource;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.scada_lts.serial.gnu.io.ScadaCommPortIdentifier;
 
 public class RadiuinoPollingDataSource extends PollingDataSource implements
 		SerialPortEventListener {
@@ -60,7 +62,7 @@ private boolean reconnect() {
 		try {
 			while (true) {
 				Thread.sleep(5000);
-				portList = CommPortIdentifier.getPortIdentifiers();
+				portList = ScadaCommPortIdentifier.getPortIdentifiers();
 				SerialPort p = getPort(vo.getCommPortId(), vo.getTimeout());
 				if (p != null) {
 					LOG.debug("Conexao estabelecida com a porta serial");
@@ -69,7 +71,7 @@ private boolean reconnect() {
 					return true;
 				}
 			}
-		} catch (Exception e) {
+		} catch (Throwable e) {
 			LOG.error("Erro ao conectar na porta serial", e);
 			return false;
 		}
@@ -153,19 +155,37 @@ protected void doPoll(long time) {
 
 	@Override
 	public void initialize() {
-		super.initialize();
 
 		LOG.debug("Inicializando o Radiuino Polling Data Source.");
 
-		portList = CommPortIdentifier.getPortIdentifiers();
-		getPort(vo.getCommPortId(), vo.getTimeout());
-		configurePort(getsPort());
+		try {
+			portList = ScadaCommPortIdentifier.getPortIdentifiers();
+			getPort(vo.getCommPortId(), vo.getTimeout());
+			configurePort(getsPort());
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
+			return;
+		}
+
+		super.initialize();
 	}
 
 	@Override
 	public void terminate() {
 		super.terminate();
-		getsPort().close();
+		try {
+			SerialPort serialPort = getsPort();
+			if(serialPort != null)
+				serialPort.close();
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+		} catch (Throwable e) {
+			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+					new LocalizableMessage("event.exception2",
+							vo.getName(), e.getMessage()));
+		}
 
 		LOG.debug("Terminando o Radiuino Polling Data Source.");
 	}
@@ -297,8 +317,8 @@ private void configurePort(SerialPort port) {
 		try {
 			setInSerialStream(port.getInputStream());
 			setOutSerialStream(port.getOutputStream());
-		} catch (Exception e) {
-			LOG.error("Erro ao configurar streaming de in e out", e);
+		} catch (Throwable e) {
+			LOG.error("Erro ao configurar streaming de in e out: " + LoggingUtils.info(e, this));
 		}
 
 		port.notifyOnDataAvailable(true);
@@ -306,16 +326,16 @@ private void configurePort(SerialPort port) {
 			port.addEventListener(this);
 			port.enableReceiveTimeout(vo.getTimeout());
 		} catch (UnsupportedCommOperationException e1) {
-			LOG.error("Comando nao suportado ao abrir a porta serial.", e1);
+			LOG.error("Comando nao suportado ao abrir a porta serial: " + LoggingUtils.info(e1, this));
 		} catch (TooManyListenersException e) {
-			LOG.error("Muitos Listeners adicionados a porta serial", e);
+			LOG.error("Muitos Listeners adicionados a porta serial: " + LoggingUtils.info(e, this));
 		}
 
 		try {
 			port.setSerialPortParams(vo.getBaudRate(), vo.getDataBits(),
 					vo.getStopBits(), vo.getParity());
-		} catch (Exception e) {
-			LOG.error("Erro ao setar parametros da porta serial", e);
+		} catch (Throwable e) {
+			LOG.error("Erro ao setar parametros da porta serial: " + LoggingUtils.info(e, this));
 		}
 
 	}
@@ -332,8 +352,8 @@ private SerialPort getPort(String port, int timeout) {
 						serialPort = (SerialPort) portId.open(this.getName(),
 								timeout);
 						setsPort(serialPort);
-					} catch (Exception e) {
-						LOG.error("Erro ao abrir a porta serial.", e);
+					} catch (Throwable e) {
+						LOG.error("Erro ao abrir a porta serial: " + LoggingUtils.info(e, this));
 					}
 				}
 			}
@@ -387,14 +407,14 @@ public void serialEvent(SerialPortEvent serialPortEvent) {
 						pacoteRecebido();
 					}
 				} catch (IOException e) {
-					LOG.error("Erro ao receber dados da porta serial", e);
+					LOG.error("Erro ao receber dados da porta serial: " + LoggingUtils.info(e, this));
 				}
 
 			} else {
 				try {
 					int i = getInSerialStream().read(buffer);
 				} catch (IOException e) {
-					LOG.error("Erro ao ler dados da porta serial", e);
+					LOG.error("Erro ao ler dados da porta serial: " + LoggingUtils.info(e, this));
 				}
 			}
 		default:
@@ -415,14 +435,15 @@ private void pacoteRecebido() {
 							.parsePacoteRadiuino(time, pacote, dataPointVO);
 					if (pointValueTime != null)
 						dataPoint.updatePointValue(pointValueTime);
-				} catch (Exception e) {
-					LOG.error("Erro ao fazer o parse dos dados.", e);
+					returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
+				} catch (Throwable e) {
+					LOG.error("Erro ao fazer o parse dos dados: " + LoggingUtils.info(e, this));
 					raiseEvent(
 							POINT_READ_EXCEPTION_EVENT,
 							time,
 							true,
 							new LocalizableMessage("event.exception2", vo
-									.getName(), e.getMessage()));
+									.getName(), e.getMessage()), dataPoint);
 				}
 
 			}
diff --git a/src/com/serotonin/mango/Common.java b/src/com/serotonin/mango/Common.java
index 67e5f4bc94..f07c3b0dd5 100644
--- a/src/com/serotonin/mango/Common.java
+++ b/src/com/serotonin/mango/Common.java
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
@@ -61,6 +62,7 @@
 import com.serotonin.util.PropertiesUtils;
 import com.serotonin.util.StringUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.scada_lts.serial.gnu.io.ScadaCommPortIdentifier;
 import org.scada_lts.serial.SerialPortUtils;
 import org.scada_lts.utils.SystemSettingsUtils;
 import org.springframework.security.core.GrantedAuthority;
@@ -354,7 +356,7 @@ public static String getFiledataPath() {
 				name = ctx.getServletContext().getRealPath(name.substring(1));
 
 			File file = new File(name);
-			if (!file.exists())
+			if (Files.notExists(file.toPath()))
 				file.mkdirs();
 
 			lazyFiledataPath = name;
@@ -411,7 +413,7 @@ public static List<CommPortProxy> getCommPorts()
 			throws CommPortConfigException {
 		try {
 			List<CommPortProxy> ports = new LinkedList<CommPortProxy>();
-			Enumeration<?> portEnum = CommPortIdentifier.getPortIdentifiers();
+			Enumeration<?> portEnum = ScadaCommPortIdentifier.getPortIdentifiers();
 			CommPortIdentifier cpid;
 			while (portEnum.hasMoreElements()) {
 				cpid = (CommPortIdentifier) portEnum.nextElement();
diff --git a/src/com/serotonin/mango/MangoContextListener.java b/src/com/serotonin/mango/MangoContextListener.java
index ed8bf66eeb..74a5f8f884 100644
--- a/src/com/serotonin/mango/MangoContextListener.java
+++ b/src/com/serotonin/mango/MangoContextListener.java
@@ -55,6 +55,11 @@
 import freemarker.cache.TemplateLoader;
 import freemarker.template.Configuration;
 import freemarker.template.DefaultObjectWrapper;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
+import org.apache.catalina.core.ApplicationContext;
+import org.apache.catalina.core.ApplicationContextFacade;
+import org.apache.catalina.core.StandardContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.mozilla.javascript.ContextFactory;
@@ -76,6 +81,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -105,6 +111,8 @@ public void contextInitialized(ServletContextEvent evt) {
 	private void initialized(ServletContextEvent evt) {
 		log.info("Scada-LTS context starting at: " + Common.getStartupTime());
 
+		sessionsInitialize(evt);
+
 		scriptContextInitialize();
 
 		// Get a handle on the context.
@@ -365,6 +373,8 @@ private void constantsInitialize(ServletContext ctx) {
 				EventType.EventSources.AUDIT);
 		ctx.setAttribute("constants.EventType.EventSources.MAINTENANCE",
 				EventType.EventSources.MAINTENANCE);
+		ctx.setAttribute("constants.EventType.EventSources.DATA_SOURCE_POINT",
+				EventType.EventSources.DATA_SOURCE_POINT);
 		ctx.setAttribute("constants.SystemEventType.TYPE_SYSTEM_STARTUP",
 				SystemEventType.TYPE_SYSTEM_STARTUP);
 		ctx.setAttribute("constants.SystemEventType.TYPE_SYSTEM_SHUTDOWN",
@@ -388,6 +398,14 @@ private void constantsInitialize(ServletContext ctx) {
 				SystemEventType.TYPE_POINT_LINK_FAILURE);
 		ctx.setAttribute("constants.SystemEventType.TYPE_PROCESS_FAILURE",
 				SystemEventType.TYPE_PROCESS_FAILURE);
+		ctx.setAttribute("constants.SystemEventType.TYPE_SMS_SEND_FAILURE",
+				SystemEventType.TYPE_SMS_SEND_FAILURE);
+		ctx.setAttribute("constants.SystemEventType.TYPE_SCRIPT_HANDLER_FAILURE",
+				SystemEventType.TYPE_SCRIPT_HANDLER_FAILURE);
+		ctx.setAttribute("constants.SystemEventType.TYPE_ASSIGNED_EVENT",
+				SystemEventType.TYPE_ASSIGNED_EVENT);
+		ctx.setAttribute("constants.SystemEventType.TYPE_UNASSIGNED_EVENT",
+				SystemEventType.TYPE_UNASSIGNED_EVENT);
 
 		ctx.setAttribute("constants.AuditEventType.TYPE_DATA_SOURCE",
 				AuditEventType.TYPE_DATA_SOURCE);
@@ -674,4 +692,33 @@ private void initSchedule() {
 			log.error(e.getMessage(), e);
 		}
 	}
+
+	private void sessionsInitialize(ServletContextEvent evt) {
+		try {
+			Session[] sessions = getSessions(evt);
+			ApplicationBeans.getLoggedUsersBean().loadSessions(sessions);
+		} catch (Exception ex) {
+			log.error(ex.getMessage(), ex);
+		}
+	}
+
+	private static Session[] getSessions(ServletContextEvent evt) throws NoSuchFieldException, IllegalAccessException {
+		Manager manager = getManager(evt);
+		return manager.findSessions();
+	}
+
+	private static Manager getManager(ServletContextEvent evt) throws NoSuchFieldException, IllegalAccessException {
+		ApplicationContextFacade applicationContextFacade =  (ApplicationContextFacade) evt.getServletContext();
+
+		Field applicationContextField = applicationContextFacade.getClass().getDeclaredField("context");
+		applicationContextField.setAccessible(true);
+		ApplicationContext applicationContext = (ApplicationContext) applicationContextField.get(applicationContextFacade);
+		applicationContextField.setAccessible(false);
+
+		Field standardContextField = applicationContext.getClass().getDeclaredField("context");
+		standardContextField.setAccessible(true);
+		StandardContext standardContext = (StandardContext) standardContextField.get(applicationContext);
+		standardContextField.setAccessible(false);
+		return standardContext.getManager();
+	}
 }
diff --git a/src/com/serotonin/mango/db/dao/ReportDao.java b/src/com/serotonin/mango/db/dao/ReportDao.java
index ae2e93ea71..de182182f8 100644
--- a/src/com/serotonin/mango/db/dao/ReportDao.java
+++ b/src/com/serotonin/mango/db/dao/ReportDao.java
@@ -59,6 +59,7 @@ public void saveReport(ReportVO report) {
 		reportService.saveReport(report);
 	}
 
+	@Deprecated(since = "2.8.0")
 	public void deleteReport(int reportId) {
 		reportService.deleteReport(reportId);
 	}
diff --git a/src/com/serotonin/mango/rt/EventManager.java b/src/com/serotonin/mango/rt/EventManager.java
index 27392e49ee..77d74fdf40 100644
--- a/src/com/serotonin/mango/rt/EventManager.java
+++ b/src/com/serotonin/mango/rt/EventManager.java
@@ -42,7 +42,6 @@
 import org.scada_lts.mango.service.UserService;
 import org.scada_lts.service.IHighestAlarmLevelService;
 import org.scada_lts.web.beans.ApplicationBeans;
-import org.scada_lts.web.ws.model.WsEventMessage;
 import org.scada_lts.web.ws.services.UserEventServiceWebSocket;
 
 import java.util.*;
@@ -139,7 +138,7 @@ public void raiseEvent(EventType type, long time, boolean rtnApplicable,
 
 				eventConfirmForUsers.add(user);
 				if(evt.getAlarmLevel() > AlarmLevels.NONE)
-					notifyEventUpdate(user, WsEventMessage.create(evt));
+					notifyEventCreate(user, evt);
 			}
 		}
 
@@ -158,9 +157,9 @@ public void raiseEvent(EventType type, long time, boolean rtnApplicable,
 				User admin = userService.getUser("admin");
 				if(admin != null) {
 					eventService.ackEvent(
-							evt.getId(),
+							evt,
 							time,
-							admin.getId(),
+							admin,
 							EventInstance.AlternateAcknowledgementSources.MAINTENANCE_MODE,
 							false); // no signaling of AlarmLevel change
 					for(User user: eventConfirmForUsers) {
@@ -450,14 +449,15 @@ public void notifyAlarmTimestampChange(long alarmTimestamp) {
 
 	}
 
-	public void resetHighestAlarmLevels() {
-		NotifyEventUtils.resetHighestAlarmLevels(highestAlarmLevelService, userService, userEventServiceWebSocket);
+	public void notifyEventReset() {
+		NotifyEventUtils.notifyEventReset(highestAlarmLevelService, userEventServiceWebSocket);
 	}
 
 	public int getHighestAlarmLevel(int userId) {
 		return highestAlarmLevelService.getAlarmLevel(User.onlyId(userId));
 	}
 
+	@Deprecated(since = "2.8.0")
 	public void notifyEventRaise(int eventId, int userId) {
 		if(eventId != Common.NEW_ID) {
 			EventInstance evt = eventService.getEvent(eventId);
@@ -466,6 +466,15 @@ public void notifyEventRaise(int eventId, int userId) {
 		}
 	}
 
+	@Deprecated(since = "2.8.0")
+	public void notifyEventRaise(int eventId) {
+		if(eventId != Common.NEW_ID) {
+			for(int userId: ApplicationBeans.getLoggedUsersBean().getUserIds()) {
+				notifyEventRaise(eventId, userId);
+			}
+		}
+	}
+
 	public void notifyEventRaise(EventInstance evt, User user) {
 		NotifyEventUtils.notifyEventRaise(highestAlarmLevelService, evt, user, userEventServiceWebSocket);
 	}
@@ -474,6 +483,7 @@ public void notifyEventAck(EventInstance evt, User user) {
 		NotifyEventUtils.notifyEventAck(highestAlarmLevelService, evt, user, userEventServiceWebSocket);
 	}
 
+	@Deprecated(since = "2.8.0")
 	public void notifyEventAck(int eventId, User user) {
 		if(eventId != Common.NEW_ID) {
 			EventInstance evt = eventService.getEvent(eventId);
@@ -481,10 +491,19 @@ public void notifyEventAck(int eventId, User user) {
 		}
 	}
 
+	@Deprecated(since = "2.8.0")
 	public void notifyEventAck(int eventId) {
 		if(eventId != Common.NEW_ID) {
-			for (User user : userService.getActiveUsers())
-				notifyEventAck(eventId, user);
+			for (int userId : ApplicationBeans.getLoggedUsersBean().getUserIds())
+				notifyEventAck(eventId, userService.getUser(userId));
+		}
+	}
+
+	@Deprecated(since = "2.8.0")
+	public void notifyEventAssignee(int eventId) {
+		if(eventId != Common.NEW_ID) {
+			for (int userId : ApplicationBeans.getLoggedUsersBean().getUserIds())
+				notifyEventAck(eventId, userService.getUser(userId));
 		}
 	}
 
@@ -494,8 +513,9 @@ public void notifyEventRtn(EventInstance evt, User user) {
 
 	public void notifyEventRtn(EventInstance event) {
 		if(event.getId() != Common.NEW_ID) {
-			for (User user : userService.getActiveUsers())
+			for (User user : ApplicationBeans.getLoggedUsersBean().getUsers()) {
 				notifyEventRtn(event, user);
+			}
 		}
 	}
 
@@ -503,6 +523,7 @@ public void notifyEventToggle(EventInstance evt, User user) {
 		NotifyEventUtils.notifyEventToggle(highestAlarmLevelService, evt, user, userEventServiceWebSocket);
 	}
 
+	@Deprecated(since = "2.8.0")
 	public void notifyEventToggle(int eventId, int userId) {
 		if(eventId != Common.NEW_ID) {
 			EventInstance evt = eventService.getEvent(eventId);
@@ -511,7 +532,31 @@ public void notifyEventToggle(int eventId, int userId) {
 		}
 	}
 
-	public void notifyEventUpdate(User user, WsEventMessage message) {
-		NotifyEventUtils.notifyEventUpdate(user, message, userEventServiceWebSocket);
+	public void notifyEventCreate(User user, EventInstance event) {
+		NotifyEventUtils.notifyEventCreate(event, user, userEventServiceWebSocket);
+	}
+
+	public void notifyEventRaise(EventInstance event) {
+		if(event.getId() != Common.NEW_ID) {
+			for (User user : ApplicationBeans.getLoggedUsersBean().getUsers()) {
+				notifyEventRaise(event, user);
+			}
+		}
+	}
+
+	public void notifyEventAck(EventInstance event) {
+		if(event.getId() != Common.NEW_ID) {
+			for (User user : ApplicationBeans.getLoggedUsersBean().getUsers()) {
+				notifyEventAck(event, user);
+			}
+		}
+	}
+
+	public void notifyEventAssignee(EventInstance event) {
+		if(event.getId() != Common.NEW_ID) {
+			for (User user : ApplicationBeans.getLoggedUsersBean().getUsers()) {
+				notifyEventToggle(event, user);
+			}
+		}
 	}
 }
diff --git a/src/com/serotonin/mango/rt/RuntimeManager.java b/src/com/serotonin/mango/rt/RuntimeManager.java
index 5ac9e28c86..28292d8dc6 100644
--- a/src/com/serotonin/mango/rt/RuntimeManager.java
+++ b/src/com/serotonin/mango/rt/RuntimeManager.java
@@ -21,6 +21,8 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import com.serotonin.mango.db.dao.*;
 import com.serotonin.mango.rt.dataImage.*;
@@ -70,6 +72,9 @@
 import com.serotonin.web.i18n.LocalizableException;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static org.scada_lts.utils.MetaDataPointUtils.isDataPointInContext;
+import static org.scada_lts.utils.MetaDataPointUtils.isMetaDataPointRT;
+
 public class RuntimeManager {
 	private static final Log LOG = LogFactory.getLog(RuntimeManager.class);
 
@@ -490,7 +495,9 @@ private void startDataPoint(DataPointVO vo) {
 				// Add/update it in the data source.
 				ds.addDataPoint(dataPoint);
 
-				LOG.info("Data point '" + vo.getExtendedName() + "' initialized");
+				boolean unreliable = dataPoint.isUnreliable();
+
+				LOG.info("Data point '" + vo.getExtendedName() + "' initialized - unreliable: " + unreliable);
 			}
 		}
 	}
@@ -1083,4 +1090,23 @@ private void startPoints() {
 	private void stopPoints() {
 		StartStopDataPointsUtils.stopPoints(this.dataPoints.values(), this::stopDataPointSafe, this::getDataPoint);
 	}
+
+	public List<DataPointRT> getRunningMetaDataPoints(int dataPointInContextId) {
+		Map<Integer, DataPointRT> dataPoints = new HashMap<>(this.dataPoints);
+		return filterRunningDataPoints(dataPoints.values(), dataPoint -> isMetaDataPointRT(dataPoint)
+				&& isDataPointInContext(dataPoint, dataPointInContextId));
+	}
+
+	private static List<DataPointRT> filterRunningDataPoints(List<DataPointRT> dataPoints, Predicate<DataPointRT> filter) {
+		return dataPoints.stream()
+				.filter(filter)
+				.collect(Collectors.toList());
+	}
+
+	private static List<DataPointRT> filterRunningDataPoints(Collection<DataPointRT> dataPoints, Predicate<DataPointRT> filter) {
+		return dataPoints.stream()
+				.filter(filter)
+				.collect(Collectors.toList());
+	}
+
 }
diff --git a/src/com/serotonin/mango/rt/dataImage/DataPointRT.java b/src/com/serotonin/mango/rt/dataImage/DataPointRT.java
index 16108ef48c..d4e8caba95 100644
--- a/src/com/serotonin/mango/rt/dataImage/DataPointRT.java
+++ b/src/com/serotonin/mango/rt/dataImage/DataPointRT.java
@@ -24,6 +24,8 @@
 import com.serotonin.mango.rt.RuntimeManager;
 import com.serotonin.mango.rt.dataImage.types.MangoValue;
 import com.serotonin.mango.rt.dataImage.types.NumericValue;
+import com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils;
+import com.serotonin.mango.rt.dataSource.DataSourceRT;
 import com.serotonin.mango.rt.dataSource.PointLocatorRT;
 import com.serotonin.mango.rt.event.detectors.PointEventDetectorRT;
 import com.serotonin.mango.rt.maint.work.AbstractBeforeAfterWorkItem;
@@ -127,32 +129,12 @@ public PointValueTime getPointValueAt(long time) {
 	public List<PointValueTime> getPointValues(long since) {
 		List<PointValueTime> result = pointValueService.getPointValues(
 				vo.getId(), since);
-
-		for (PointValueTime pvt : valueCache.getCacheContents()) {
-			if (pvt.getTime() >= since) {
-				int index = Collections.binarySearch(result, pvt,
-						pvtTimeComparator);
-				if (index < 0)
-					result.add(-index - 1, pvt);
-			}
-		}
-
 		return result;
 	}
 
 	public List<PointValueTime> getPointValuesBetween(long from, long to) {
 		List<PointValueTime> result = pointValueService
 				.getPointValuesBetween(vo.getId(), from, to);
-
-		for (PointValueTime pvt : valueCache.getCacheContents()) {
-			if (pvt.getTime() >= from && pvt.getTime() < to) {
-				int index = Collections.binarySearch(result, pvt,
-						pvtTimeComparator);
-				if (index < 0)
-					result.add(-index - 1, pvt);
-			}
-		}
-
 		return result;
 	}
 
@@ -624,6 +606,17 @@ public void terminateHistorical() {
 		terminateIntervalLogging();
 	}
 
+	public boolean isUnreliable() {
+		DataSourceRT dataSourceRT = Common.ctx.getRuntimeManager().getRunningDataSource(getDataSourceId());
+		if(dataSourceRT == null)
+			return true;
+		return !dataSourceRT.isInitialized() || isSetUnreliable();
+	}
+
+	public boolean isSetUnreliable() {
+		return DataPointUnreliableUtils.isSetUnreliable(this, true);
+  }
+  
 	public boolean isInitialized() {
 		return initialized;
 	}
diff --git a/src/com/serotonin/mango/rt/dataImage/types/AlphanumericValue.java b/src/com/serotonin/mango/rt/dataImage/types/AlphanumericValue.java
index 0d2c82613d..179c0e4ee8 100644
--- a/src/com/serotonin/mango/rt/dataImage/types/AlphanumericValue.java
+++ b/src/com/serotonin/mango/rt/dataImage/types/AlphanumericValue.java
@@ -20,6 +20,7 @@
 
 import com.serotonin.mango.DataTypes;
 import com.serotonin.util.StringUtils;
+import org.scada_lts.utils.SystemSettingsUtils;
 
 /**
  * @author Matthew Lohbihler
@@ -28,7 +29,7 @@ public class AlphanumericValue extends MangoValue implements Comparable<Alphanum
     private final String value;
 
     public AlphanumericValue(String value) {
-        this.value = StringUtils.escapeLT(value);
+        this.value = SystemSettingsUtils.isDataTypeAlphanumericSaveValueAsEscaped() ? StringUtils.escapeLT(value) : value;
     }
 
     @Override
diff --git a/src/com/serotonin/mango/rt/dataSource/DataPointUnreliableUtils.java b/src/com/serotonin/mango/rt/dataSource/DataPointUnreliableUtils.java
new file mode 100644
index 0000000000..3d5a5ee6dc
--- /dev/null
+++ b/src/com/serotonin/mango/rt/dataSource/DataPointUnreliableUtils.java
@@ -0,0 +1,70 @@
+package com.serotonin.mango.rt.dataSource;
+
+import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.dataImage.DataPointRT;
+import com.serotonin.mango.util.LoggingUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public final class DataPointUnreliableUtils {
+
+    private static final Log LOG = LogFactory.getLog(DataPointUnreliableUtils.class);
+
+    private static final String ATTR_UNRELIABLE_KEY = "UNRELIABLE";
+    private static final int SAFE = 10;
+
+    private DataPointUnreliableUtils() {}
+
+    public static boolean isSetUnreliable(DataPointRT dataPoint, boolean unreliable) {
+        return dataPoint.getAttribute(ATTR_UNRELIABLE_KEY) instanceof Boolean
+                && ((boolean) dataPoint.getAttribute(ATTR_UNRELIABLE_KEY)) == unreliable;
+    }
+
+    public static void setUnreliableDataPoints(List<DataPointRT> dataPoints) {
+        unreliable(dataPoints, true, SAFE);
+    }
+
+    public static void setUnreliableDataPoint(DataPointRT dataPoint) {
+        unreliable(Collections.singletonList(dataPoint), true, SAFE);
+    }
+
+    public static void resetUnreliableDataPoints(List<DataPointRT> dataPoints) {
+        unreliable(dataPoints, false, SAFE);
+    }
+
+    public static void resetUnreliableDataPoint(DataPointRT dataPoint) {
+        unreliable(Collections.singletonList(dataPoint), false, SAFE);
+    }
+
+    private static void unreliable(List<DataPointRT> dataPoints, boolean unreliable, int safe) {
+        setAttributes(filter(dataPoints, unreliable), unreliable);
+        for(DataPointRT dataPoint: dataPoints) {
+            List<DataPointRT> metaDataPoints = Common.ctx.getRuntimeManager().getRunningMetaDataPoints(dataPoint.getId());
+            if(!metaDataPoints.isEmpty()) {
+                if(safe > -1)
+                    unreliable(metaDataPoints, unreliable, --safe);
+                else {
+                    LOG.warn("The safe counter has been exceeded!: " + LoggingUtils.dataPointInfo(dataPoint));
+                    setAttributes(filter(metaDataPoints, unreliable), unreliable);
+                }
+            }
+        }
+    }
+
+    private static void setAttributes(List<DataPointRT> dataPoints, boolean unreliable) {
+        for (DataPointRT dataPoint : dataPoints) {
+            dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, unreliable);
+        }
+    }
+
+    private static List<DataPointRT> filter(List<DataPointRT> dataPoints, boolean unreliable) {
+        return dataPoints.stream().filter(dataPoint -> !isSetUnreliable(dataPoint, unreliable))
+                .collect(Collectors.toList());
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/com/serotonin/mango/rt/dataSource/DataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/DataSourceRT.java
index 620260cc36..7818958f95 100644
--- a/src/com/serotonin/mango/rt/dataSource/DataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/DataSourceRT.java
@@ -18,6 +18,8 @@
  */
 package com.serotonin.mango.rt.dataSource;
 
+import com.serotonin.mango.rt.event.type.DataSourcePointEventType;
+import com.serotonin.mango.vo.DataPointVO;
 import gnu.io.NoSuchPortException;
 import gnu.io.PortInUseException;
 
@@ -35,6 +37,8 @@
 import com.serotonin.util.ILifecycle;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.*;
+
 /**
  * Data sources are things that produce data for consumption of this system. Anything that houses, creates, manages, or
  * otherwise can get data to Mango can be considered a data source. As such, this interface can more precisely be
@@ -49,8 +53,12 @@
  * @author Matthew Lohbihler
  */
 abstract public class DataSourceRT implements ILifecycle {
+
+    @Deprecated(since = "2.8.0")
     public static final String ATTR_UNRELIABLE_KEY = "UNRELIABLE";
 
+    private volatile boolean initialized;
+
     private final DataSourceVO<?> vo;
 
     /**
@@ -80,7 +88,7 @@ abstract public class DataSourceRT implements ILifecycle {
     public DataSourceRT(DataSourceVO<?> vo) {
         this.vo = vo;
 
-        eventTypes = new ArrayList<DataSourceEventType>();
+        eventTypes = new ArrayList<>();
         for (EventTypeVO etvo : vo.getEventTypes())
             eventTypes.add((DataSourceEventType) etvo.createEventType());
     }
@@ -126,6 +134,11 @@ public void removeDataPoint(DataPointRT dataPoint) {
 
     abstract public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime, SetPointSource source);
 
+    protected abstract List<DataPointRT> getDataPoints();
+    public boolean isInitialized() {
+        return initialized;
+    }
+
     public void relinquish(@SuppressWarnings("unused") DataPointRT dataPoint) {
         throw new ShouldNeverHappenException("not implemented in " + getClass());
     }
@@ -143,9 +156,22 @@ public static void raiseEvent(String describe, DataSourceVO vo) {
         Common.ctx.getEventManager().raiseEvent(dset, new Date().getTime(), true, dset.getAlarmLevel(), message, context);
     }
 
-    protected void raiseEvent(int eventId, long time, boolean rtn, LocalizableMessage message) {
+    private void _raiseEvent(int eventId, long time, boolean rtn, LocalizableMessage message) {
         message = new LocalizableMessage("event.ds", vo.getName(), message);
-        DataSourceEventType type = getEventType(eventId);
+        _raiseEvent(eventId, time, rtn, message, -1);
+    }
+
+    private void _returnToNormal(int eventId, long time) {
+        _returnToNormal(eventId, time, -1);
+    }
+
+    private void _raiseEvent(int eventId, long time, boolean rtn, LocalizableMessage message, DataPointVO dataPoint) {
+        message = new LocalizableMessage("event.ds", dataPoint.getExtendedName(), message);
+        _raiseEvent(eventId, time, rtn, message, dataPoint.getId());
+    }
+
+    private void _raiseEvent(int eventId, long time, boolean rtn, LocalizableMessage message, int dataPointId) {
+        DataSourceEventType type = getDataSourceEventType(eventId, dataPointId);
 
         Map<String, Object> context = new HashMap<String, Object>();
         context.put("dataSource", vo);
@@ -153,11 +179,42 @@ protected void raiseEvent(int eventId, long time, boolean rtn, LocalizableMessag
         Common.ctx.getEventManager().raiseEvent(type, time, rtn, type.getAlarmLevel(), message, context);
     }
 
-    protected void returnToNormal(int eventId, long time) {
-        DataSourceEventType type = getEventType(eventId);
+    private void _returnToNormal(int eventId, long time, int dataPointId) {
+        DataSourceEventType type = getDataSourceEventType(eventId, dataPointId);
         Common.ctx.getEventManager().returnToNormal(type, time);
     }
 
+    private DataSourceEventType getDataSourceEventType(int eventId, int dataPointId) {
+        DataSourceEventType eventType = getEventType(eventId);
+        if(eventType == null)
+            return null;
+        if(dataPointId == Common.NEW_ID)
+            return eventType;
+        return new DataSourcePointEventType(eventType, dataPointId);
+    }
+
+    protected void raiseEvent(int eventId, long time, boolean rtn, LocalizableMessage message) {
+        _raiseEvent(eventId, time, rtn, message);
+        List<DataPointRT> dataPoints = getDataPoints();
+        setUnreliableDataPoints(dataPoints);
+    }
+
+    protected void raiseEvent(int eventId, long time, boolean rtn, LocalizableMessage message, DataPointRT dataPoint) {
+        _raiseEvent(eventId, time, rtn, message, dataPoint.getVO());
+        setUnreliableDataPoint(dataPoint);
+    }
+
+    protected void returnToNormal(int eventId, long time) {
+        _returnToNormal(eventId, time);
+        List<DataPointRT> dataPoints = getDataPoints();
+        resetUnreliableDataPoints(dataPoints);
+    }
+
+    protected void returnToNormal(int eventId, long time, DataPointRT dataPoint) {
+        _returnToNormal(eventId, time, dataPoint.getId());
+        resetUnreliableDataPoint(dataPoint);
+    }
+
     protected DataSourceEventType getEventType(int eventId) {
         for (DataSourceEventType et : eventTypes) {
             if (et.getDataSourceEventTypeId() == eventId)
@@ -166,7 +223,7 @@ protected DataSourceEventType getEventType(int eventId) {
         return null;
     }
 
-    protected LocalizableMessage getSerialExceptionMessage(Exception e, String portId) {
+    protected LocalizableMessage getSerialExceptionMessage(Throwable e, String portId) {
         if (e instanceof NoSuchPortException)
             return new LocalizableMessage("event.serial.portOpenError", portId);
         if (e instanceof PortInUseException)
@@ -174,7 +231,7 @@ protected LocalizableMessage getSerialExceptionMessage(Exception e, String portI
         return getExceptionMessage(e);
     }
 
-    protected static LocalizableMessage getExceptionMessage(Exception e) {
+    protected static LocalizableMessage getExceptionMessage(Throwable e) {
         return new LocalizableMessage("event.exception2", e.getClass().getName(), e.getMessage());
     }
 
@@ -185,9 +242,11 @@ protected static LocalizableMessage getExceptionMessage(Exception e) {
     //
     public void initialize() {
         // no op
+        this.initialized = true;
     }
 
     public void terminate() {
+        this.initialized = false;
         // Remove any outstanding events.
         Common.ctx.getEventManager().cancelEventsForDataSource(vo.getId());
     }
diff --git a/src/com/serotonin/mango/rt/dataSource/DataSourceUtils.java b/src/com/serotonin/mango/rt/dataSource/DataSourceUtils.java
index dbde05832d..b5738bc89b 100644
--- a/src/com/serotonin/mango/rt/dataSource/DataSourceUtils.java
+++ b/src/com/serotonin/mango/rt/dataSource/DataSourceUtils.java
@@ -162,6 +162,12 @@ public static MangoValue getValue(String valueStr, int dataTypeId,
 		return null;
 	}
 
+	public static <T> void checkInitialized(T master, DataSourceRT dataSource) {
+		if(master == null || !dataSource.isInitialized()) {
+			throw new IllegalStateException("Data Source not initialized!");
+		}
+  }
+  
 	public static DataPointVO copyAndSaveDataPoint(DataSourceVO<?> dataSource, DataPointVO dataPoint, DataPointService dataPointService) {
 		DataPointVO dataPointCopy = dataPoint.copy();
 		dataPointCopy.setId(Common.NEW_ID);
diff --git a/src/com/serotonin/mango/rt/dataSource/EventDataSource.java b/src/com/serotonin/mango/rt/dataSource/EventDataSource.java
index 44bee9c9f5..21a7cf3855 100644
--- a/src/com/serotonin/mango/rt/dataSource/EventDataSource.java
+++ b/src/com/serotonin/mango/rt/dataSource/EventDataSource.java
@@ -53,4 +53,9 @@ public void removeDataPoint(DataPointRT dataPoint) {
     public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime, SetPointSource source) {
         // Typically, event based data sources cannot set point values, so don't make subclasses implement this.
     }
+
+    @Override
+    protected List<DataPointRT> getDataPoints() {
+        return dataPoints;
+    }
 }
diff --git a/src/com/serotonin/mango/rt/dataSource/PollingDataSource.java b/src/com/serotonin/mango/rt/dataSource/PollingDataSource.java
index 39d6cfc471..4098723397 100644
--- a/src/com/serotonin/mango/rt/dataSource/PollingDataSource.java
+++ b/src/com/serotonin/mango/rt/dataSource/PollingDataSource.java
@@ -144,6 +144,11 @@ public void joinTermination() {
         }
     }
 
+    @Override
+    protected List<DataPointRT> getDataPoints() {
+        return dataPoints;
+    }
+  
     public boolean isMarkAsTerminating() {
         if(markAsTerminating) {
             LOG.info(LoggingUtils.dataSourceInfo(this) + " is terminating.");
diff --git a/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java
index 4b1ece3cf7..d2824e4e85 100644
--- a/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java
@@ -91,6 +91,9 @@
 import com.serotonin.web.i18n.LocalizableMessage;
 import com.serotonin.web.taglib.DateFunctions;
 
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.resetUnreliableDataPoint;
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.setUnreliableDataPoint;
+
 /**
  * @author Matthew Lohbihler
  */
@@ -102,7 +105,7 @@ public class BACnetIPDataSourceRT extends PollingDataSource implements DeviceEve
     final Log log = LogFactory.getLog(BACnetIPDataSourceRT.class);
     final BACnetIPDataSourceVO vo;
     private LocalDevice localDevice;
-    private boolean initialized = false;
+    private volatile boolean initialized = false;
     final List<RemoteDevice> pollsInProgress = new ArrayList<RemoteDevice>();
     private CovResubscriptionTask covResubscriptionTask;
 
@@ -137,7 +140,7 @@ public void initialize() {
             // Deactivate any existing event.
             returnToNormal(INITIALIZATION_EXCEPTION_EVENT, System.currentTimeMillis());
         }
-        catch (Exception e) {
+        catch (Throwable e) {
             raiseEvent(INITIALIZATION_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
                     "event.initializationError", e.getMessage()));
             return;
@@ -148,15 +151,17 @@ public void initialize() {
         // Let everyone know we're here.
         try {
             localDevice.sendBroadcast(localDevice.getIAm());
+            returnToNormal();
         }
         catch (BACnetException e) {
             fireMessageExceptionEvent("event.bacnet.iamError", e.getMessage());
+            return;
         }
 
         // Find out who we're slummin with.
         try {
             localDevice.sendBroadcast(new WhoIsRequest());
-
+            returnToNormal();
             // Wait for responses to come in.
             try {
                 Thread.sleep(vo.getTimeout() / 4);
@@ -167,9 +172,10 @@ public void initialize() {
         }
         catch (BACnetException e) {
             fireMessageExceptionEvent("event.bacnet.whoisError", e.getMessage());
+            return;
         }
 
-        initialized = true;
+        initialized = isInitialized(localDevice);
     }
 
     @Override
@@ -204,6 +210,7 @@ public void terminate() {
             }
         }
         LocalDevice.setExceptionListener(null);
+        initialized = isInitialized(localDevice);
     }
 
     @Override
@@ -221,9 +228,10 @@ public void addDataPoint(DataPointRT dataPoint) {
             // Send a whois to get remote device data.
             try {
                 localDevice.sendUnconfirmed(address, null, new WhoIsRequest());
+                returnToNormal(dataPoint);
             }
             catch (BACnetException e) {
-                fireMessageExceptionEvent("event.bacnet.whoisPoint", dataPoint.getVO().getName(), e.getMessage());
+                fireMessageExceptionEvent(dataPoint,"event.bacnet.whoisPoint", dataPoint.getVO().getName(), e.getMessage());
                 disablePoint(dataPoint);
                 return;
             }
@@ -250,19 +258,21 @@ public void addDataPoint(DataPointRT dataPoint) {
             // If we still don't have the device, try to get it manually.
             try {
                 d = localDevice.findRemoteDevice(address, network, locator.getRemoteDeviceInstanceNumber());
+                resetUnreliableDataPoint(dataPoint);
             }
             catch (BACnetException e) {
-                // Ignore.
+                log.warn(LoggingUtils.info(e, this), e);
             }
             catch (PropertyValueException e) {
+                setUnreliableDataPoint(dataPoint);
                 // Shouldn't happen, so just log.
-                log.error("Couldn't manually get segmentation and vendor id from device", e);
+                log.error("Couldn't manually get segmentation and vendor id from device: " + LoggingUtils.info(e, this));
             }
         }
 
         if (d == null) {
             // If we still don't have the device, call it in.
-            fireDeviceExceptionEvent("event.bacnet.deviceError", address.toIpString());
+            fireDeviceExceptionEvent(dataPoint,"event.bacnet.deviceError", address.toIpString());
             disablePoint(dataPoint);
         }
         else {
@@ -274,6 +284,7 @@ public void addDataPoint(DataPointRT dataPoint) {
             }
 
             super.addDataPoint(dataPoint);
+            returnToNormal(dataPoint);
         }
     }
 
@@ -369,11 +380,11 @@ public String getDetails() {
         }
 
         private String getPoints() {
-            if(dataPoints == null) {
+            if(points == null) {
                 return "";
             }
             StringBuilder info = new StringBuilder();
-            for(DataPointRT dataPoint: dataPoints) {
+            for(DataPointRT dataPoint: points) {
                 info.append(LoggingUtils.dataPointInfo(dataPoint.getVO())).append("\n");
             }
             return info.toString();
@@ -391,7 +402,6 @@ void pollDevice(RemoteDevice d, List<DataPointRT> points, long time) {
         try {
             // Send the read request.
             PropertyValues values = localDevice.readProperties(d, refs);
-
             // Dereference the property values back into the points.
             for (DataPointRT dp : points) {
                 BACnetIPPointLocatorRT locator = dp.getPointLocator();
@@ -416,19 +426,20 @@ public void forcePointRead(DataPointRT dataPoint) {
             dereferencePoint(dataPoint, ack.getValue(), System.currentTimeMillis());
         }
         catch (BACnetException e) {
-            fireMessageExceptionEvent("event.bacnet.readDevice", d.getAddress().toIpString(), e.getMessage());
+            fireMessageExceptionEvent(dataPoint, "event.bacnet.readDevice", d.getAddress().toIpString(), e.getMessage());
         }
     }
 
     private void dereferencePoint(DataPointRT dp, Encodable encodable, long time) {
-        if (encodable == null)
-            fireDeviceExceptionEvent("event.bacnet.readError", dp.getVO().getName(), "no value returned");
-        else if (encodable instanceof BACnetError)
-            fireDeviceExceptionEvent("event.bacnet.readError", dp.getVO().getName(),
-                    ((BACnetError) encodable).getErrorCode());
-        else {
+        if (encodable == null) {
+            fireDeviceExceptionEvent(dp, "event.bacnet.readError", dp.getVO().getName(), "no value returned");
+        } else if (encodable instanceof BACnetError) {
+            fireDeviceExceptionEvent(dp, "event.bacnet.readError", dp.getVO().getName(),
+                    String.valueOf(((BACnetError) encodable).getErrorCode()));
+        } else {
             MangoValue value = encodableToValue(encodable, dp.getDataTypeId());
             dp.updatePointValue(new PointValueTime(value, time));
+            returnToNormal(dp);
         }
     }
 
@@ -447,9 +458,10 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime pvt, SetPointSou
                     new UnsignedInteger(locator.getWritePriority()));
             localDevice.send(locator.getRemoteDevice(), writeRequest);
             dataPoint.setPointValue(pvt, source);
+            returnToNormal(dataPoint);
         }
         catch (Throwable t) {
-            fireMessageExceptionEvent("event.setPointFailed", t.getMessage());
+            fireMessageExceptionEvent(dataPoint, "event.setPointFailed", t.getMessage());
         }
     }
 
@@ -469,11 +481,12 @@ public void relinquish(DataPointRT dataPoint) {
             forcePointRead(dataPoint);
         }
         catch (Throwable t) {
-            fireMessageExceptionEvent("event.relinquishFailed", t.getMessage());
+            fireMessageExceptionEvent(dataPoint, "event.relinquishFailed", t.getMessage());
         }
     }
 
-    List<DataPointRT> getDataPoints() {
+    @Override
+    protected List<DataPointRT> getDataPoints() {
         return dataPoints;
     }
 
@@ -560,6 +573,7 @@ public void covNotificationReceived(UnsignedInteger subscriberProcessIdentifier,
                     sendCovSubscriptionImpl(initiatingDevice, monitoredObjectIdentifier, covId, true);
                 }
                 catch (BACnetException e) { /* Ignore exceptions */
+                    log.warn(LoggingUtils.info(e, this), e);
                 }
             }
         }
@@ -609,7 +623,7 @@ public void receivedThrowable(Throwable t) {
 
     public void unimplementedVendorService(UnsignedInteger vendorId, UnsignedInteger serviceNumber, ByteQueue queue) {
         log.warn("Received unimplemented vendor service: vendor id=" + vendorId + ", service number=" + serviceNumber
-                + ", bytes (with context id)=" + queue);
+                + ", bytes (with context id)=" + queue + " : " + LoggingUtils.dataSourceInfo(this));
     }
 
     //
@@ -627,7 +641,7 @@ boolean sendCovSubscription(DataPointRT dataPoint, boolean unsubscribe) {
             // If we are unsubscribing a failure doesn't really matter since the lease will expire eventually anyway,
             // so ignore.
             if (!unsubscribe) {
-                fireMessageExceptionEvent("event.bacnet.covFailed",
+                fireMessageExceptionEvent(dataPoint, "event.bacnet.covFailed",
                         locator.getRemoteDevice().getAddress().toIpString(), e.getMessage());
                 disablePoint(dataPoint);
                 return false;
@@ -658,12 +672,24 @@ private void fireMessageExceptionEvent(Throwable t) {
         log.info("", t);
     }
 
-    private void fireMessageExceptionEvent(String key, Object... args) {
-        raiseEvent(MESSAGE_EXCEPTION_EVENT, System.currentTimeMillis(), false, new LocalizableMessage(key, args));
+    private void fireMessageExceptionEvent(String key, String... args) {
+        raiseEvent(MESSAGE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(key, (Object[]) args));
+    }
+
+    private void fireMessageExceptionEvent(DataPointRT dataPointRT, String key, String... args) {
+        raiseEvent(MESSAGE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(key, (Object[]) args), dataPointRT);
     }
 
-    private void fireDeviceExceptionEvent(String key, Object... args) {
-        raiseEvent(DEVICE_EXCEPTION_EVENT, System.currentTimeMillis(), false, new LocalizableMessage(key, args));
+    private void fireDeviceExceptionEvent(DataPointRT dataPointRT, String key, String... args) {
+        raiseEvent(DEVICE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(key, (Object[]) args), dataPointRT);
+    }
+
+    private void returnToNormal() {
+        returnToNormal(DEVICE_EXCEPTION_EVENT, System.currentTimeMillis());
+    }
+
+    private void returnToNormal(DataPointRT dataPoint) {
+        returnToNormal(DEVICE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
     }
 
     private void disablePoint(DataPointRT dataPoint) {
@@ -780,4 +806,13 @@ else if (value instanceof AlphanumericValue) {
 
         throw new ShouldNeverHappenException("Unknown data type: " + value.getClass().getName());
     }
+
+    @Override
+    public boolean isInitialized() {
+        return initialized;
+    }
+
+    private boolean isInitialized(LocalDevice localDevice) {
+        return localDevice != null && localDevice.isInitialized() && super.isInitialized();
+    }
 }
diff --git a/src/com/serotonin/mango/rt/dataSource/galil/GalilDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/galil/GalilDataSourceRT.java
index 9934955ba1..62d30be4a8 100644
--- a/src/com/serotonin/mango/rt/dataSource/galil/GalilDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/galil/GalilDataSourceRT.java
@@ -65,8 +65,10 @@ synchronized protected void doPoll(long time) {
         if (socket == null) {
             try {
                 openConnection();
-            }
-            catch (IOException e) {
+                returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, time);
+            } catch (Throwable messageException) {
+                raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, time, true, new LocalizableMessage("event.pollingError",
+                        messageException.getMessage()));
                 return;
             }
         }
@@ -83,16 +85,14 @@ synchronized protected void doPoll(long time) {
 
                 try {
                     sendMsg = sendRequest(request, dataPoint, locator, time);
-                }
-                catch (IOException e) {
+                } catch (Throwable e) {
                     // The connection may have been reset, so try to reopen it and attempt the message again.
                     try {
-                        LOG.debug("Keep-alive connection may have been reset. Attempting to re-open.");
+                        LOG.warn("Keep-alive connection may have been reset. Attempting to re-open.");
                         closeConnection();
                         openConnection();
                         sendMsg = sendRequest(request, dataPoint, locator, time);
-                    }
-                    catch (Exception e2) {
+                    } catch (Exception e2) {
                         messageException = e2;
                         closeConnection();
                         break;
@@ -105,10 +105,11 @@ synchronized protected void doPoll(long time) {
         }
 
         if (messageException != null) {
+            LOG.info("Error while polling Galil device", messageException);
             // Raise an event.
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, time, true, new LocalizableMessage("event.pollingError",
                     messageException.getMessage()));
-            LOG.info("Error while polling Galil device", messageException);
+            return;
         }
         else
             // Deactivate any existing event.
@@ -117,6 +118,7 @@ synchronized protected void doPoll(long time) {
         if (pointError != null) {
             // Raise an event.
             raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true, pointError);
+            return;
         }
         else
             // Deactivate any existing event.
@@ -156,11 +158,12 @@ public void initialize() {
             returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
         }
         catch (Exception e) {
+            LOG.warn("Error while initializing data source", e);
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
                     "event.initializationError", e.getMessage()));
-            LOG.debug("Error while initializing data source", e);
             return;
         }
+        super.initialize();
     }
 
     @Override
@@ -181,33 +184,33 @@ synchronized public void setPointValue(DataPointRT dataPoint, PointValueTime val
         if (socket == null) {
             try {
                 openConnection();
-            }
-            catch (IOException e) {
+                returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+            } catch (Throwable e) {
+                LOG.warn("Error while initializing data source", e);
                 raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                        "event.galil.setPointFailed", dataPoint.getVO().getName(), e.getMessage()));
-                LOG.debug("Error while initializing data source", e);
+                        "event.galil.setPointFailed", dataPoint.getVO().getName(), e.getMessage()), dataPoint);
                 return;
             }
-            returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
         }
 
         GalilPointLocatorRT locator = dataPoint.getPointLocator();
 
         GalilRequest request = locator.getSetRequest(valueTime.getValue());
         if (request == null)
-            raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), false, new LocalizableMessage(
-                    "event.galil.setRequest", dataPoint.getVO().getName(), valueTime.getValue()));
+            raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
+                    "event.galil.setRequest", dataPoint.getVO().getName(), valueTime.getValue()), dataPoint);
         else {
             try {
                 GalilResponse response = (GalilResponse) conn.send(request);
 
                 if (response.isErrorResponse())
-                    raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), false, new LocalizableMessage(
-                            "event.galil.setResponse", dataPoint.getVO().getName()));
+                    raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
+                            "event.galil.setResponse", dataPoint.getVO().getName()), dataPoint);
                 else {
                     try {
                         // Update the data image with the new value.
                         dataPoint.updatePointValue(new PointValueTime(valueTime.getValue(), valueTime.getTime()));
+                        returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
 
                         MangoValue value = locator.parseSetResponse(response.getResponseData());
                         if (value != null)
@@ -215,15 +218,15 @@ synchronized public void setPointValue(DataPointRT dataPoint, PointValueTime val
                             dataPoint.updatePointValue(new PointValueTime(value, System.currentTimeMillis()));
                     }
                     catch (LocalizableException e) {
-                        raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), false,
+                        raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
                                 new LocalizableMessage("event.galil.parsingError", dataPoint.getVO().getName(),
-                                        response.getResponseData()));
+                                        response.getResponseData()), dataPoint);
                     }
                 }
             }
-            catch (IOException e) {
-                raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), false, new LocalizableMessage(
-                        "event.galil.sendError", dataPoint.getVO().getName(), e.getMessage()));
+            catch (Throwable e) {
+                raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
+                        "event.galil.sendError", dataPoint.getVO().getName(), e.getMessage()), dataPoint);
             }
         }
     }
diff --git a/src/com/serotonin/mango/rt/dataSource/http/HttpImageDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/http/HttpImageDataSourceRT.java
index afc9239d2a..ce8094ec98 100644
--- a/src/com/serotonin/mango/rt/dataSource/http/HttpImageDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/http/HttpImageDataSourceRT.java
@@ -92,10 +92,12 @@ protected void doPoll(long time) {
         }
 
         // Check the results.
-        if (monitor.getRetrievalFailure() != null)
+        if (monitor.getRetrievalFailure() != null) {
             raiseEvent(DATA_RETRIEVAL_FAILURE_EVENT, time, true, monitor.getRetrievalFailure());
-        else
+            return;
+        } else {
             returnToNormal(DATA_RETRIEVAL_FAILURE_EVENT, time);
+        }
 
         if (monitor.getSaveFailure() != null)
             raiseEvent(FILE_SAVE_EXCEPTION_EVENT, time, true, monitor.getSaveFailure());
diff --git a/src/com/serotonin/mango/rt/dataSource/http/HttpReceiverDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/http/HttpReceiverDataSourceRT.java
index 6fd1ef1bfa..6ccf382673 100644
--- a/src/com/serotonin/mango/rt/dataSource/http/HttpReceiverDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/http/HttpReceiverDataSourceRT.java
@@ -18,6 +18,8 @@
  */
 package com.serotonin.mango.rt.dataSource.http;
 
+import com.serotonin.mango.util.LoggingUtils;
+import com.serotonin.web.i18n.LocalizableMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -36,6 +38,8 @@
  * @author Matthew Lohbihler
  */
 public class HttpReceiverDataSourceRT extends EventDataSource implements HttpMulticastListener {
+
+    public static final int INITIALIZATION_EXCEPTION_EVENT = 1;
     private final Log log = LogFactory.getLog(HttpReceiverDataSourceRT.class);
     private final HttpReceiverDataSourceVO vo;
 
@@ -51,14 +55,26 @@ public HttpReceiverDataSourceRT(HttpReceiverDataSourceVO vo) {
     //
     @Override
     public void initialize() {
-        Common.ctx.getHttpReceiverMulticaster().addListener(this);
+        try {
+            Common.ctx.getHttpReceiverMulticaster().addListener(this);
+            returnToNormal(INITIALIZATION_EXCEPTION_EVENT, System.currentTimeMillis());
+        } catch (Throwable e) {
+            raiseEvent(INITIALIZATION_EXCEPTION_EVENT,
+                    System.currentTimeMillis(), true, new LocalizableMessage(
+                            "event.initializationError", e.getMessage()));
+            return;
+        }
         super.initialize();
     }
 
     @Override
     public void terminate() {
         super.terminate();
-        Common.ctx.getHttpReceiverMulticaster().removeListener(this);
+        try {
+            Common.ctx.getHttpReceiverMulticaster().removeListener(this);
+        } catch (Throwable e) {
+            log.warn(LoggingUtils.info(e, this), e);
+        }
     }
 
     //
diff --git a/src/com/serotonin/mango/rt/dataSource/http/HttpRetrieverDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/http/HttpRetrieverDataSourceRT.java
index 503a4e3a57..9a714fcbf6 100644
--- a/src/com/serotonin/mango/rt/dataSource/http/HttpRetrieverDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/http/HttpRetrieverDataSourceRT.java
@@ -71,7 +71,7 @@ public HttpRetrieverDataSourceRT(HttpRetrieverDataSourceVO vo, StopSleepRT stopS
 
     @Override
     public void removeDataPoint(DataPointRT dataPoint) {
-        returnToNormal(PARSE_EXCEPTION_EVENT, System.currentTimeMillis());
+        returnToNormal(PARSE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
         super.removeDataPoint(dataPoint);
     }
 
@@ -127,7 +127,7 @@ protected void doPoll(long time) {
         }
 
         if (parseErrorMessage != null)
-            raiseEvent(PARSE_EXCEPTION_EVENT, time, false, parseErrorMessage);
+            raiseEvent(PARSE_EXCEPTION_EVENT, time, true, parseErrorMessage);
         else
             returnToNormal(PARSE_EXCEPTION_EVENT, time);
     }
diff --git a/src/com/serotonin/mango/rt/dataSource/jmx/JmxDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/jmx/JmxDataSourceRT.java
index a5c8be4094..e1599968c9 100644
--- a/src/com/serotonin/mango/rt/dataSource/jmx/JmxDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/jmx/JmxDataSourceRT.java
@@ -124,7 +124,7 @@ protected void doPoll(long time) {
     public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime, SetPointSource source) {
         if (server == null) {
             raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                    "dsEdit.jmx.writeFailed", dataPoint.getVO().getName()));
+                    "dsEdit.jmx.writeFailed", dataPoint.getVO().getName()), dataPoint);
             return;
         }
 
@@ -132,13 +132,13 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime, SetPo
         JmxPointLocatorRT loc = dataPoint.getPointLocator();
         if (loc.getObjectName() == null) {
             raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                    "dsEdit.jmx.writeFailed", dataPoint.getVO().getName()));
+                    "dsEdit.jmx.writeFailed", dataPoint.getVO().getName()), dataPoint);
             return;
         }
 
         if (loc.isComposite()) {
             raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                    "dsEdit.jmx.writeFailed.composite", dataPoint.getVO().getName()));
+                    "dsEdit.jmx.writeFailed.composite", dataPoint.getVO().getName()), dataPoint);
             return;
         }
 
@@ -146,10 +146,11 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime, SetPo
                 loc.mangoValueToManagementValue(valueTime.getValue()));
         try {
             server.setAttribute(loc.getObjectName(), attr);
+            returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
         }
         catch (Exception e) {
             raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                    "dsEdit.jmx.writeFailed.msg", dataPoint.getVO().getName(), e.getMessage()));
+                    "dsEdit.jmx.writeFailed.msg", dataPoint.getVO().getName(), e.getMessage()), dataPoint);
         }
     }
 
@@ -206,12 +207,12 @@ private boolean updateDataPoint(DataPointRT dp) {
             catch (MalformedObjectNameException e) {
                 raiseEvent(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), true,
                         new LocalizableMessage("dsEdit.jmx.objectNameError", loc.getPointLocatorVO().getObjectName(),
-                                dp.getVO().getName(), e.getMessage()));
+                                dp.getVO().getName(), e.getMessage()), dp);
                 return false;
             }
             catch (NullPointerException e) {
                 raiseEvent(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                        "dsEdit.jmx.objectNameNotFound", loc.getPointLocatorVO().getObjectName(), dp.getVO().getName()));
+                        "dsEdit.jmx.objectNameNotFound", loc.getPointLocatorVO().getObjectName(), dp.getVO().getName()), dp);
                 return false;
             }
             updated = true;
@@ -224,7 +225,7 @@ private boolean updateDataPoint(DataPointRT dp) {
             }
             catch (Exception e) {
                 raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                        "common.default", e.getMessage()));
+                        "common.default", e.getMessage()), dp);
                 return false;
             }
 
@@ -232,7 +233,7 @@ private boolean updateDataPoint(DataPointRT dp) {
             if (attr == null) {
                 raiseEvent(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
                         "dsEdit.jmx.attributeNameNotFound", loc.getPointLocatorVO().getAttributeName(), dp.getVO()
-                                .getName()));
+                                .getName()), dp);
                 return false;
             }
 
@@ -242,7 +243,7 @@ private boolean updateDataPoint(DataPointRT dp) {
 
                 if (!JmxPointLocatorRT.isValidType(type)) {
                     raiseEvent(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                            "dsEdit.jmx.attributeTypeNotSupported", type, dp.getVO().getName()));
+                            "dsEdit.jmx.attributeTypeNotSupported", type, dp.getVO().getName()), dp);
                     return false;
                 }
 
@@ -251,7 +252,7 @@ private boolean updateDataPoint(DataPointRT dp) {
                 if (!attr.getType().equals("javax.management.openmbean.CompositeData")) {
                     raiseEvent(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
                             "dsEdit.jmx.attributeNotComposite", loc.getPointLocatorVO().getAttributeName(), dp.getVO()
-                                    .getName()));
+                                    .getName()), dp);
                     return false;
                 }
 
@@ -261,7 +262,7 @@ private boolean updateDataPoint(DataPointRT dp) {
                 }
                 catch (Exception e) {
                     raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                            "common.default", e.getMessage()));
+                            "common.default", e.getMessage()), dp);
                     return false;
                 }
 
@@ -269,7 +270,7 @@ private boolean updateDataPoint(DataPointRT dp) {
                 if (openType == null) {
                     raiseEvent(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
                             "dsEdit.jmx.compositeNameNotFound", loc.getPointLocatorVO().getCompositeItemName(), dp
-                                    .getVO().getName()));
+                                    .getVO().getName()), dp);
                     return false;
                 }
 
@@ -277,7 +278,7 @@ private boolean updateDataPoint(DataPointRT dp) {
 
                 if (!JmxPointLocatorRT.isValidType(type)) {
                     raiseEvent(POINT_READ_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
-                            "dsEdit.jmx.compositeTypeNotSupported", type, dp.getVO().getName()));
+                            "dsEdit.jmx.compositeTypeNotSupported", type, dp.getVO().getName()), dp);
                     return false;
                 }
             }
diff --git a/src/com/serotonin/mango/rt/dataSource/mbus/MBusDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/mbus/MBusDataSourceRT.java
index 3d23917390..72e673ab08 100644
--- a/src/com/serotonin/mango/rt/dataSource/mbus/MBusDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/mbus/MBusDataSourceRT.java
@@ -61,13 +61,13 @@ public MBusDataSourceRT(MBusDataSourceVO vo) {
 
     @Override
     public void initialize() {
-        LOG.fatal("INITIALIZE MBusaDataSourceRT" + Thread.getAllStackTraces().get(Thread.currentThread()));
+        LOG.debug("INITIALIZE MBusaDataSourceRT" + Thread.getAllStackTraces().get(Thread.currentThread()));
         super.initialize();
     }
 
     @Override
     public void terminate() {
-        LOG.fatal("TERMINATE MBusaDataSourceRT" + Thread.getAllStackTraces().get(Thread.currentThread()));
+        LOG.debug("TERMINATE MBusaDataSourceRT" + Thread.getAllStackTraces().get(Thread.currentThread()));
         super.terminate();
     }
 
@@ -184,6 +184,7 @@ private boolean openConnection() {
     private void closeConnection() {
         try {
             master.close();
+            returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
         } catch (IOException ex) {
             LOG.fatal("Close port", ex);
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
diff --git a/src/com/serotonin/mango/rt/dataSource/meta/HistoricalMetaPointLocatorRT.java b/src/com/serotonin/mango/rt/dataSource/meta/HistoricalMetaPointLocatorRT.java
index ec13289060..4f8a130b69 100644
--- a/src/com/serotonin/mango/rt/dataSource/meta/HistoricalMetaPointLocatorRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/meta/HistoricalMetaPointLocatorRT.java
@@ -1,19 +1,12 @@
 package com.serotonin.mango.rt.dataSource.meta;
 
-import java.util.HashMap;
-
-import com.serotonin.db.IntValuePair;
-import com.serotonin.mango.db.dao.DataPointDao;
-import com.serotonin.mango.db.dao.PointValueDao;
 import com.serotonin.mango.rt.dataImage.DataPointRT;
-import com.serotonin.mango.rt.dataImage.HistoricalDataPoint;
-import com.serotonin.mango.rt.dataImage.IDataPoint;
 import com.serotonin.mango.rt.dataImage.PointValueTime;
-import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
 import com.serotonin.timer.SimulationTimer;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+@Deprecated(since = "2.8.0")
 public class HistoricalMetaPointLocatorRT extends MetaPointLocatorRT {
     private long updates;
 
@@ -26,16 +19,7 @@ public void initialize(SimulationTimer timer, DataPointRT dataPoint) {
         this.dataPoint = dataPoint;
         initialized = true;
         initializeTimerTask();
-
-        context = new HashMap<String, IDataPoint>();
-        DataPointDao dataPointDao = new DataPointDao();
-        PointValueDao pointValueDao = new PointValueDao();
-        for (IntValuePair contextEntry : vo.getContext()) {
-            DataPointVO cvo = dataPointDao.getDataPoint(contextEntry.getKey());
-            HistoricalDataPoint point = new HistoricalDataPoint(cvo.getId(), cvo.getPointLocator().getDataTypeId(),
-                    timer, pointValueDao);
-            context.put(contextEntry.getValue(), point);
-        }
+        this.context = createContext(dataPoint);
     }
 
     @Override
@@ -52,13 +36,13 @@ public long getUpdates() {
     }
 
     @Override
-    protected void updatePoint(PointValueTime pvt) {
-        super.updatePoint(pvt);
+    protected void doUpdate(PointValueTime pvt, DataPointRT dataPoint) {
+        super.doUpdate(pvt, dataPoint);
         updates++;
     }
 
     @Override
-    protected void handleError(long runtime, LocalizableMessage message) {
+    protected void handleScriptError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
         throw new MetaPointExecutionException(message);
     }
 }
diff --git a/src/com/serotonin/mango/rt/dataSource/meta/MetaDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/meta/MetaDataSourceRT.java
index ed814affe1..b42dbd5c69 100644
--- a/src/com/serotonin/mango/rt/dataSource/meta/MetaDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/meta/MetaDataSourceRT.java
@@ -31,6 +31,8 @@
 import com.serotonin.mango.vo.dataSource.meta.MetaDataSourceVO;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.*;
+
 /**
  * @author Matthew Lohbihler
  */
@@ -38,8 +40,10 @@ public class MetaDataSourceRT extends DataSourceRT {
     public static final int EVENT_TYPE_CONTEXT_POINT_DISABLED = 1;
     public static final int EVENT_TYPE_SCRIPT_ERROR = 2;
     public static final int EVENT_TYPE_RESULT_TYPE_ERROR = 3;
+    public static final int EVENT_TYPE_RECURSIVE_ERROR = 4;
 
     private final List<DataPointRT> points = new CopyOnWriteArrayList<DataPointRT>();
+    @Deprecated(since = "2.8.0")
     private boolean contextPointDisabledEventActive;
 
     public MetaDataSourceRT(MetaDataSourceVO vo) {
@@ -59,7 +63,6 @@ public void addDataPoint(DataPointRT dataPoint) {
             MetaPointLocatorRT locator = dataPoint.getPointLocator();
             points.add(dataPoint);
             locator.initialize(Common.timer, this, dataPoint);
-            checkForDisabledPoints();
         }
     }
 
@@ -67,7 +70,6 @@ public void addDataPoint(DataPointRT dataPoint) {
     public void removeDataPoint(DataPointRT dataPoint) {
         synchronized (pointListChangeLock) {
             remove(dataPoint);
-            checkForDisabledPoints();
         }
     }
 
@@ -77,6 +79,7 @@ private void remove(DataPointRT dataPoint) {
         points.remove(dataPoint);
     }
 
+    @Deprecated(since = "2.8.0")
     synchronized void checkForDisabledPoints() {
         DataPointRT problemPoint = null;
 
@@ -93,7 +96,7 @@ synchronized void checkForDisabledPoints() {
             if (contextPointDisabledEventActive)
                 // A context point has been terminated, was never enabled, or not longer exists.
                 raiseEvent(EVENT_TYPE_CONTEXT_POINT_DISABLED, System.currentTimeMillis(), true, new LocalizableMessage(
-                        "event.meta.pointUnavailable", problemPoint.getVO().getName()));
+                        "event.meta.pointUnavailable", problemPoint.getVO().getName()), problemPoint);
             else
                 // Everything is good
                 returnToNormal(EVENT_TYPE_CONTEXT_POINT_DISABLED, System.currentTimeMillis());
@@ -101,17 +104,70 @@ synchronized void checkForDisabledPoints() {
     }
 
     public void raiseScriptError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
-        if(isNone(EVENT_TYPE_SCRIPT_ERROR))
+        if(isNone(EVENT_TYPE_SCRIPT_ERROR)) {
+            setUnreliableDataPoint(dataPoint);
+            return;
+        }
+        raiseEvent(EVENT_TYPE_SCRIPT_ERROR, runtime, true, new LocalizableMessage("event.meta.scriptError", dataPoint
+                .getVO().getName(), message), dataPoint);
+    }
+
+    public void raiseRecursiveError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
+        if(isNone(EVENT_TYPE_RECURSIVE_ERROR)) {
+            setUnreliableDataPoint(dataPoint);
+            return;
+        }
+        raiseEvent(EVENT_TYPE_RECURSIVE_ERROR, runtime, true, new LocalizableMessage("event.meta.recursiveError", dataPoint
+                .getVO().getName(), message), dataPoint);
+    }
+
+    public void raiseContextError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
+        if(isNone(EVENT_TYPE_CONTEXT_POINT_DISABLED)) {
+            setUnreliableDataPoint(dataPoint);
+            return;
+        }
+        raiseEvent(EVENT_TYPE_CONTEXT_POINT_DISABLED, runtime, true, message, dataPoint);
+    }
+
+    public void returnToNormalScript(long runtime, DataPointRT dataPoint) {
+        if(isNone(EVENT_TYPE_SCRIPT_ERROR)) {
+            resetUnreliableDataPoint(dataPoint);
+            return;
+        }
+        returnToNormal(EVENT_TYPE_SCRIPT_ERROR, runtime, dataPoint);
+    }
+
+    public void returnToNormalRecursive(long runtime, DataPointRT dataPoint) {
+        if(isNone(EVENT_TYPE_RECURSIVE_ERROR)) {
+            resetUnreliableDataPoint(dataPoint);
+            return;
+        }
+        returnToNormal(EVENT_TYPE_RECURSIVE_ERROR, runtime, dataPoint);
+    }
+
+    public void returnToNormalContext(long runtime, DataPointRT dataPoint) {
+        if(isNone(EVENT_TYPE_CONTEXT_POINT_DISABLED)) {
+            resetUnreliableDataPoint(dataPoint);
             return;
-        raiseEvent(EVENT_TYPE_SCRIPT_ERROR, runtime, false, new LocalizableMessage("event.meta.scriptError", dataPoint
-                .getVO().getName(), message));
+        }
+        returnToNormal(EVENT_TYPE_CONTEXT_POINT_DISABLED, runtime, dataPoint);
     }
 
     public void raiseResultTypeError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
-        if(isNone(EVENT_TYPE_RESULT_TYPE_ERROR))
+        if(isNone(EVENT_TYPE_RESULT_TYPE_ERROR)) {
+            setUnreliableDataPoint(dataPoint);
             return;
-        raiseEvent(EVENT_TYPE_RESULT_TYPE_ERROR, runtime, false, new LocalizableMessage("event.meta.typeError",
-                dataPoint.getVO().getName(), message));
+        }
+        raiseEvent(EVENT_TYPE_RESULT_TYPE_ERROR, runtime, true, new LocalizableMessage("event.meta.typeError",
+                dataPoint.getVO().getName(), message), dataPoint);
+    }
+
+    public void returnToNormalType(long runtime, DataPointRT dataPoint) {
+        if(isNone(EVENT_TYPE_RESULT_TYPE_ERROR)) {
+            resetUnreliableDataPoint(dataPoint);
+            return;
+        }
+        returnToNormal(EVENT_TYPE_RESULT_TYPE_ERROR, runtime, dataPoint);
     }
 
     private boolean isNone(int type) {
@@ -120,4 +176,9 @@ private boolean isNone(int type) {
             return true;
         return object.getAlarmLevel() == AlarmLevels.NONE;
     }
+
+    @Override
+    protected List<DataPointRT> getDataPoints() {
+        return points;
+    }
 }
diff --git a/src/com/serotonin/mango/rt/dataSource/meta/MetaPointLocatorRT.java b/src/com/serotonin/mango/rt/dataSource/meta/MetaPointLocatorRT.java
index 1c382958d7..7d7b11130e 100644
--- a/src/com/serotonin/mango/rt/dataSource/meta/MetaPointLocatorRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/meta/MetaPointLocatorRT.java
@@ -24,6 +24,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.script.ScriptException;
 
@@ -37,6 +38,7 @@
 import com.serotonin.mango.rt.dataImage.PointValueTime;
 import com.serotonin.mango.rt.dataSource.PointLocatorRT;
 import com.serotonin.mango.util.DateUtils;
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
 import com.serotonin.timer.AbstractTimer;
 import com.serotonin.timer.CronExpression;
@@ -64,11 +66,14 @@ public class MetaPointLocatorRT extends PointLocatorRT implements DataPointListe
     AbstractTimer timer;
     private MetaDataSourceRT dataSource;
     protected DataPointRT dataPoint;
-    protected Map<String, IDataPoint> context;
+    protected volatile Map<String, IDataPoint> context;
     boolean initialized;
     TimerTask timerTask;
 
-    private final static Log LOG = LogFactory.getLog(MetaPointLocatorRT.class);
+    private final AtomicInteger pointInitializedSafe = new AtomicInteger(MAX_RECURSION);
+    private final AtomicInteger pointTerminatedSafe = new AtomicInteger(MAX_RECURSION);
+
+    private static final Log LOG = LogFactory.getLog(MetaPointLocatorRT.class);
 
     public MetaPointLocatorRT(MetaPointLocatorVO vo) {
         this.vo = vo;
@@ -83,6 +88,7 @@ public MetaPointLocatorVO getPointLocatorVO() {
         return vo;
     }
 
+    @Deprecated(since = "2.8.0")
     boolean isContextCreated() {
         return context != null;
     }
@@ -97,7 +103,7 @@ public void initialize(AbstractTimer timer, MetaDataSourceRT dataSource, DataPoi
         this.dataSource = dataSource;
         this.dataPoint = dataPoint;
 
-        createContext();
+        this.context = createContext(dataPoint);
 
         // Add listener registrations
         RuntimeManager rm = Common.ctx.getRuntimeManager();
@@ -107,10 +113,10 @@ public void initialize(AbstractTimer timer, MetaDataSourceRT dataSource, DataPoi
                 rm.addDataPointListener(contextKey.getKey(), this);
         }
 
-        initialized = true;
-
         initializeTimerTask();
 
+        initialized = true;
+
         if(dataPoint.isInitialized() && (vo.getUpdateEvent() == MetaPointLocatorVO.UPDATE_EVENT_CONTEXT_CHANGE
                 || vo.getUpdateEvent() == MetaPointLocatorVO.UPDATE_EVENT_CONTEXT_UPDATE) && !vo.getContext().isEmpty()) {
             execute(System.currentTimeMillis(), new ArrayList<>(), true, dataPoint);
@@ -166,13 +172,43 @@ public void pointBackdated(PointValueTime value) {
     }
 
     public void pointInitialized() {
-        createContext();
-        dataSource.checkForDisabledPoints();
+
+        context = createContext(dataPoint);
+
+        if(context == null) {
+            return;
+        }
+
+        if(pointInitializedSafe.getAndDecrement() < 0) {
+            LOG.error("Exceeded recursive level: " + LoggingUtils.dataPointInfo(dataPoint));
+            pointInitializedSafe.set(MAX_RECURSION);
+            return;
+        }
+
+        if(dataPoint.getPointLocator() instanceof MetaPointLocatorRT) {
+            DataPointListener dataPointListener = Common.ctx.getRuntimeManager().getDataPointListeners(dataPoint.getId());
+            if(dataPointListener != null) {
+                dataPointListener.pointInitialized();
+            }
+        }
     }
 
     public void pointTerminated() {
-        createContext();
-        dataSource.checkForDisabledPoints();
+
+        context = createContext(dataPoint);
+
+        if(pointTerminatedSafe.getAndDecrement() < 0) {
+            LOG.error("Exceeded recursive level: " + LoggingUtils.dataPointInfo(dataPoint));
+            pointTerminatedSafe.set(MAX_RECURSION);
+            return;
+        }
+
+        if(dataPoint.getPointLocator() instanceof MetaPointLocatorRT) {
+            DataPointListener dataPointListener = Common.ctx.getRuntimeManager().getDataPointListeners(dataPoint.getId());
+            if(dataPointListener != null) {
+                dataPointListener.pointTerminated();
+            }
+        }
     }
 
     //
@@ -238,7 +274,8 @@ private void execute(long runtime, List<Integer> sourceIds) {
     }
 
     private void execute(long runtime, List<Integer> sourceIds, boolean initializeMode, DataPointRT dataPoint) {
-        if (context == null) {
+        this.context = createContext(dataPoint);
+        if(context == null) {
             LOG.warn("MetaPointLocatorRT.context is null, Context: " + generateContext(dataPoint, dataSource));
             return;
         }
@@ -251,11 +288,13 @@ private void execute(long runtime, List<Integer> sourceIds, boolean initializeMo
         }
 
         if (count > MAX_RECURSION) {
-            handleError(runtime, new LocalizableMessage("event.meta.recursionFailure"));
+            handleRecursiveError(runtime, dataPoint, new LocalizableMessage("event.meta.recursionFailure"));
             String msg = MessageFormat.format("Recursion failure: exceeded MAX_RECURSION: expected <= {0} but was {1}, Context: {2}",
                     String.valueOf(MAX_RECURSION), count, generateContext(dataPoint, dataSource));
             LOG.warn(msg);
             return;
+        } else {
+            returnToNormalRecursive(runtime, dataPoint);
         }
 
         sourceIds.add(dataPoint.getId());
@@ -265,23 +304,21 @@ private void execute(long runtime, List<Integer> sourceIds, boolean initializeMo
             try {
                 PointValueTime valueTime = executor.execute(vo.getScript(), context, timer.currentTimeMillis(),
                         vo.getDataTypeId(), runtime);
+                returnToNormalType(System.currentTimeMillis(), dataPoint);
                 PointValueTime previousValueTime = dataPoint.getPointValue();
                 if (valueTime.getValue() == null)
-                    handleError(runtime, new LocalizableMessage("event.meta.nullResult"));
+                    handleScriptError(runtime, dataPoint, new LocalizableMessage("event.meta.nullResult"));
                 else if(isUpdatePoint(initializeMode, valueTime, previousValueTime, vo))
-                    updatePoint(valueTime);
-            }
-            catch (ScriptException e) {
-                handleError(runtime, new LocalizableMessage("common.default", e.getMessage()));
+                    doUpdate(valueTime, dataPoint);
+            } catch (ScriptException e) {
+                handleScriptError(runtime, dataPoint, new LocalizableMessage("common.default", e.getLocalizedMessage()));
                 LOG.warn(infoErrorExecutionScript(e, dataPoint, dataSource));
-            }
-            catch (ResultTypeException e) {
-                handleError(runtime, e.getLocalizableMessage());
+            } catch (ResultTypeException e) {
+                handleTypeError(runtime, dataPoint, e.getLocalizableMessage());
                 LOG.warn(infoErrorExecutionScript(e, dataPoint, dataSource));
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
+                handleScriptError(runtime, dataPoint, new LocalizableMessage("common.default", e.getMessage()));
                 LOG.warn(infoErrorExecutionScript(e, dataPoint, dataSource));
-                throw e;
             }
         }
         finally {
@@ -289,13 +326,16 @@ else if(isUpdatePoint(initializeMode, valueTime, previousValueTime, vo))
         }
     }
 
-    private void createContext() {
-        context = null;
+    protected Map<String, IDataPoint> createContext(DataPointRT dataPoint) {
+        Map<String, IDataPoint> context;
         try {
             ScriptExecutor scriptExecutor = new ScriptExecutor();
-            context = scriptExecutor.convertContext(vo.getContext());
+            context = scriptExecutor.convertContext(vo.getContext(), dataPoint, this.dataSource);
+            returnToNormalContext(System.currentTimeMillis(), dataPoint);
+            return context;
         } catch (Exception e) {
             LOG.warn(infoErrorInitializationScript(e, dataPoint, dataSource));
+            return null;
         }
     }
 
@@ -325,14 +365,43 @@ private void execute(PointValueTime newValue, boolean initializeMode) {
         }
     }
 
-    protected void updatePoint(PointValueTime pvt) {
+    protected void doUpdate(PointValueTime pvt, DataPointRT dataPoint) {
         dataPoint.updatePointValue(pvt);
+        returnToNormal(System.currentTimeMillis(), dataPoint);
     }
 
-    protected void handleError(long runtime, LocalizableMessage message) {
+    protected void handleRecursiveError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
+        dataSource.raiseRecursiveError(runtime, dataPoint, message);
+    }
+
+    protected void handleScriptError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
         dataSource.raiseScriptError(runtime, dataPoint, message);
     }
 
+    protected void handleContextError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
+        dataSource.raiseContextError(runtime, dataPoint, message);
+    }
+
+    protected void returnToNormal(long runtime, DataPointRT dataPoint) {
+        dataSource.returnToNormalScript(runtime, dataPoint);
+    }
+
+    protected void returnToNormalRecursive(long runtime, DataPointRT dataPoint) {
+        dataSource.returnToNormalRecursive(runtime, dataPoint);
+    }
+
+    protected void returnToNormalContext(long runtime, DataPointRT dataPoint) {
+        dataSource.returnToNormalContext(runtime, dataPoint);
+    }
+
+    protected void handleTypeError(long runtime, DataPointRT dataPoint, LocalizableMessage message) {
+        dataSource.raiseResultTypeError(runtime, dataPoint, message);
+    }
+
+    protected void returnToNormalType(long runtime, DataPointRT dataPoint) {
+        dataSource.returnToNormalType(runtime, dataPoint);
+    }
+
     private static boolean isUpdatePoint(boolean initializeMode, PointValueTime valueTime, PointValueTime previousValueTime, MetaPointLocatorVO metaPointLocator) {
         return !initializeMode || (metaPointLocator.getUpdateEvent() != MetaPointLocatorVO.UPDATE_EVENT_CONTEXT_CHANGE
                 && metaPointLocator.getUpdateEvent() != MetaPointLocatorVO.UPDATE_EVENT_CONTEXT_UPDATE)
diff --git a/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java b/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java
index 99f4ef9a4a..572b5a8a89 100644
--- a/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java
+++ b/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java
@@ -28,6 +28,7 @@
 
 import javax.script.ScriptException;
 
+import com.serotonin.mango.util.LoggingUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.mozilla.javascript.Context;
@@ -64,22 +65,52 @@ public static void setScriptFunctionPath(String path) {
 		SCRIPT_FUNCTION_PATH = path;
 	}
 
-	public Map<String, IDataPoint> convertContext(List<IntValuePair> context)
-			throws DataPointStateException {
+	public Map<String, IDataPoint> convertContext(List<IntValuePair> context) throws Exception {
+		return convertContext(context, null, null);
+	}
+
+	public Map<String, IDataPoint> convertContext(List<IntValuePair> context, DataPointRT dataPoint, MetaDataSourceRT metaDataSource) throws Exception {
 		RuntimeManager rtm = Common.ctx.getRuntimeManager();
 
-		Map<String, IDataPoint> converted = new HashMap<String, IDataPoint>();
+		Map<String, IDataPoint> converted = new HashMap<>();
+		List<DataPointStateException> exceptions = new ArrayList<>();
 		for (IntValuePair contextEntry : context) {
-			DataPointRT point = rtm.getDataPoint(contextEntry.getKey());
-			if (point == null) {
-				LOG.error("Error DataPointRT null "
-						+ new Exception("key:" + contextEntry.getKey()
-								+ " value:" + contextEntry.getValue()));
-				throw new DataPointStateException(contextEntry.getKey(),
-						new LocalizableMessage("event.meta.pointMissing"));
+			if(dataPoint == null || dataPoint.getId() == Common.NEW_ID || dataPoint.getId() != contextEntry.getKey()) {
+				DataPointRT point = rtm.getDataPoint(contextEntry.getKey());
+				if (point == null) {
+					LOG.error("Error DataPointRT null "
+							+ new Exception("key:" + contextEntry.getKey()
+							+ " value:" + contextEntry.getValue()) + " from:" + LoggingUtils.dataPointInfo(dataPoint));
+					DataPointStateException dataPointStateException = createPointUnavailableException(contextEntry);
+					if(dataPoint != null && metaDataSource != null) {
+						metaDataSource.raiseContextError(System.currentTimeMillis(), dataPoint, dataPointStateException.getLocalizableMessage());
+					}
+					exceptions.add(dataPointStateException);
+				} else if (point.isUnreliable()) {
+					LOG.warn("Error DataPointRT is unavailable "
+							+ new Exception("key:" + contextEntry.getKey()
+							+ " value:" + contextEntry.getValue()) + " - " + LoggingUtils.dataPointInfo(point));
+					DataPointStateException dataPointStateException = createPointUnavailableException(contextEntry, point);
+					if(dataPoint != null && metaDataSource != null) {
+						metaDataSource.raiseContextError(System.currentTimeMillis(), dataPoint, dataPointStateException.getLocalizableMessage());
+					}
+					exceptions.add(dataPointStateException);
+				} else {
+					converted.put(contextEntry.getValue(), point);
+				}
 			}
-			converted.put(contextEntry.getValue(), point);
 		}
+		if(!exceptions.isEmpty()) {
+			StringBuilder messages = new StringBuilder();
+			for(DataPointStateException exception: exceptions) {
+				LocalizableMessage localizableMessage = exception.getLocalizableMessage();
+				String message = localizableMessage.getLocalizedMessage(Common.getBundle());
+				messages.append(message).append(";");
+			}
+			throw new Exception(messages.toString());
+		}
+		if(dataPoint != null && metaDataSource != null)
+			metaDataSource.returnToNormalContext(System.currentTimeMillis(), dataPoint);
 
 		return converted;
 	}
@@ -336,4 +367,14 @@ private static void ensureFunctions() {
 			FUNCTIONS = sw.toString();
 		}
 	}
+
+	private static DataPointStateException createPointUnavailableException(IntValuePair contextEntry, DataPointRT point) {
+		return new DataPointStateException(contextEntry.getKey(),
+				new LocalizableMessage("event.meta.pointUnavailable", point.getVO().getExtendedName()));
+	}
+
+	private static DataPointStateException createPointUnavailableException(IntValuePair contextEntry) {
+		return new DataPointStateException(contextEntry.getKey(),
+				new LocalizableMessage("validate.invalidVariable", LoggingUtils.varInfo(contextEntry)));
+	}
 }
diff --git a/src/com/serotonin/mango/rt/dataSource/modbus/ModbusDataSource.java b/src/com/serotonin/mango/rt/dataSource/modbus/ModbusDataSource.java
index 5361b9ca47..d603047bb7 100644
--- a/src/com/serotonin/mango/rt/dataSource/modbus/ModbusDataSource.java
+++ b/src/com/serotonin/mango/rt/dataSource/modbus/ModbusDataSource.java
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.modbus4j.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -50,6 +51,9 @@
 import com.serotonin.modbus4j.sero.messaging.TimeoutException;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.*;
+import static com.serotonin.mango.rt.dataSource.DataSourceUtils.checkInitialized;
+
 abstract public class ModbusDataSource extends PollingDataSource implements
 		MessagingExceptionHandler {
 	private final Log LOG = LogFactory.getLog(ModbusDataSource.class);
@@ -58,6 +62,8 @@ abstract public class ModbusDataSource extends PollingDataSource implements
 	public static final int POINT_READ_EXCEPTION_EVENT = 1;
 	public static final int POINT_WRITE_EXCEPTION_EVENT = 2;
 	public static final int DATA_SOURCE_EXCEPTION_EVENT = 3;
+	public static final int MONITOR_WRITE_EXCEPTION_EVENT = 4;
+	public static final int INITIALIZATION_EXCEPTION_EVENT = 5;
 
 	private ModbusMaster modbusMaster;
 	private BatchRead<ModbusPointLocatorRT> batchRead;
@@ -78,7 +84,7 @@ public void addDataPoint(DataPointRT dataPoint) {
 		// Mark the point as unreliable.
 		ModbusPointLocatorVO locatorVO = dataPoint.getVO().getPointLocator();
 		if (!locatorVO.isSlaveMonitor() && !locatorVO.isSocketMonitor())
-			dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+			setUnreliableDataPoint(dataPoint);
 
 		// Slave monitor points.
 		if (vo.isCreateSlaveMonitorPoints()) {
@@ -147,8 +153,14 @@ public void removeDataPoint(DataPointRT dataPoint) {
 
 	@Override
 	protected void doPoll(long time) {
-		
-		
+		try {
+			checkInitialized(modbusMaster, this);
+			returnToNormal(INITIALIZATION_EXCEPTION_EVENT, time);
+		} catch (Throwable e) {
+			raiseEvent(INITIALIZATION_EXCEPTION_EVENT, time, true,
+					getLocalExceptionMessage(e));
+			return;
+		}
 
 		if (!modbusMaster.isInitialized()) {
 			if (vo.isCreateSlaveMonitorPoints()) {
@@ -188,6 +200,9 @@ protected void doPoll(long time) {
 				}
 			}
 		} catch (Exception e) {
+			LOG.warn(LoggingUtils.info(e, this));
+			setUnreliableDataPoints(dataPoints);
+			return;
 		}
 
 		try {
@@ -206,21 +221,19 @@ protected void doPoll(long time) {
 
 				if (result instanceof ExceptionResult) {
 					ExceptionResult exceptionResult = (ExceptionResult) result;
-					LOG.trace("Point: " + locator.getVO().getOffset()
+					LOG.warn("Point: " + locator.getVO().getOffset()
 							+ " Exception: "
 							+ exceptionResult.getExceptionMessage());
 					if (exceptionResult.getExceptionMessage().contains(
 							"no active connection")) {
-						LOG.trace("Cannot reach source, setting monitors to false");
+						LOG.warn("Cannot reach source, setting monitors to false");
 						slaveStatuses.put(locator.getVO().getSlaveId(), false);
 					} else {
 						// Raise an event.
 						raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true,
 								new LocalizableMessage("event.exception2",
 										dataPoint.getVO().getName(),
-										exceptionResult.getExceptionMessage()));
-
-						dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+										exceptionResult.getExceptionMessage()), dataPoint);
 
 						// A response, albeit an undesirable one, was received
 						// from
@@ -239,11 +252,11 @@ protected void doPoll(long time) {
 								new LocalizableMessage(
 										"event.modbus.noConnection", dataPoint
 												.getVO().getDataSourceName(), e
-												.getMessage()));
+												.getMessage()), dataPoint);
 					} else {
 						// Raise an event.
 						raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, time, true,
-								getLocalExceptionMessage(e));
+								getLocalExceptionMessage(e), dataPoint);
 					}
 
 					// Update the slave status. Only set to false if it is
@@ -254,8 +267,6 @@ protected void doPoll(long time) {
 						slaveStatuses.put(locator.getVO().getSlaveId(), false);
 
 					dataSourceExceptions = true;
-
-					dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
 				} else {
 					/*
 					 * When an event is raised from the Callback
@@ -271,13 +282,12 @@ protected void doPoll(long time) {
 					 * it´s effective. TODO: Treat this type of exception
 					 * only... but how?!
 					 */
-					LOG.trace("Point: " + locator.getVO().getOffset()
+					LOG.warn("Point: " + locator.getVO().getOffset()
 							+ " eventRaised: " + eventRaised);
 					if (!eventRaised) {
-						returnToNormal(POINT_READ_EXCEPTION_EVENT, time);
-						dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, false);
 						updatePointValue(dataPoint, locator, result, time);
 						slaveStatuses.put(locator.getVO().getSlaveId(), true);
+						returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
 					}
 				}
 			}
@@ -305,8 +315,14 @@ protected void doPoll(long time) {
 
 						if (oldOnline != newOnline) {
 							LOG.trace("Monitor.setPointValue(): " + newOnline);
-							monitor.setPointValue(new PointValueTime(newOnline,
-									time), null);
+							try {
+								monitor.setPointValue(new PointValueTime(newOnline,
+										time), null);
+								returnToNormal(MONITOR_WRITE_EXCEPTION_EVENT, time, monitor);
+							} catch (Exception e) {
+								raiseEvent(MONITOR_WRITE_EXCEPTION_EVENT, time, true,
+										getLocalExceptionMessage(e), monitor);
+							}
 						}
 					}
 				}
@@ -340,10 +356,10 @@ protected void initialize(ModbusMaster modbusMaster) {
 			modbusMaster.init();
 
 			// Deactivate any existing event.
-			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT,
+			returnToNormal(INITIALIZATION_EXCEPTION_EVENT,
 					System.currentTimeMillis());
-		} catch (Exception e) {
-			raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(),
+		} catch (Throwable e) {
+			raiseEvent(INITIALIZATION_EXCEPTION_EVENT, System.currentTimeMillis(),
 					true, getLocalExceptionMessage(e));
 			return;
 		}
@@ -354,26 +370,6 @@ protected void initialize(ModbusMaster modbusMaster) {
 	@Override
 	public void forcePointRead(DataPointRT dataPoint) {
 
-		if (!modbusMaster.isInitialized()) {
-			// terminate();
-			//
-			// vo.setEnabled(false);
-			//
-			// RuntimeManager runtimeManager = Common.ctx.getRuntimeManager();
-			//
-			// for (DataPointRT dP : dataPoints) {
-			// dP.getVO().setEnabled(false);
-			// }
-			//
-			// for (DataPointRT dP : dataPoints) {
-			// dP.getVO().setEnabled(true);
-			// runtimeManager.saveDataPoint(dP.getVO());
-			// }
-			//
-			// vo.setEnabled(true);
-			// runtimeManager.saveDataSource(vo);
-		}
-
 		ModbusPointLocatorRT pl = dataPoint.getPointLocator();
 		if (pl.getVO().isSlaveMonitor() || pl.getVO().isSocketMonitor())
 			// Nothing to do
@@ -384,20 +380,18 @@ public void forcePointRead(DataPointRT dataPoint) {
 
 		synchronized (pointListChangeLock) {
 			try {
+				checkInitialized(modbusMaster, this);
 				Object value = modbusMaster.getValue(ml);
-
-				returnToNormal(POINT_READ_EXCEPTION_EVENT, time);
-				dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, false);
 				updatePointValue(dataPoint, pl, value, time);
+				returnToNormal(POINT_READ_EXCEPTION_EVENT, time, dataPoint);
 			} catch (ErrorResponseException e) {
 				raiseEvent(POINT_READ_EXCEPTION_EVENT, time, true,
 						new LocalizableMessage("event.exception2", dataPoint
-								.getVO().getName(), e.getMessage()));
-				dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
-			} catch (ModbusTransportException e) {
+								.getVO().getName(), e.getMessage()), dataPoint);
+			} catch (Throwable e) {
 				// Don't raise a data source exception. Polling should do that.
 				LOG.warn("Error during forcePointRead", e);
-				dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+				setUnreliableDataPoint(dataPoint);
 			}
 		}
 	}
@@ -424,7 +418,8 @@ else if (pl.getVO().getDataTypeId() == DataTypes.ALPHANUMERIC)
 	@Override
 	public void terminate() {
 		super.terminate();
-		modbusMaster.destroy();
+		if(modbusMaster != null)
+			modbusMaster.destroy();
 	}
 
 	//
@@ -439,6 +434,7 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 		BaseLocator<?> ml = createModbusLocator(pl.getVO());
 
 		try {
+			checkInitialized(modbusMaster, this);
 			// See if this is a numeric value that needs to be converted.
 			if (dataPoint.getDataTypeId() == DataTypes.NUMERIC) {
 				double convertedValue = valueTime.getDoubleValue();
@@ -456,27 +452,31 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
 			dataPoint.setPointValue(valueTime, source);
 
 			// Deactivate any existing event.
-			returnToNormal(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime());
+			returnToNormal(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime(), dataPoint);
 		} catch (ModbusTransportException e) {
 			if (e.getMessage().contains("no active connection")) {
 				// Raise an event.
 				raiseEvent(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime(),
 						true, new LocalizableMessage(
 								"event.modbus.noConnection", dataPoint.getVO()
-										.getDataSourceName(), e.getMessage()));
+										.getDataSourceName(), e.getMessage()), dataPoint);
 			} else {
 				// Raise an event.
 				raiseEvent(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime(),
 						true, new LocalizableMessage("event.exception2",
-								dataPoint.getVO().getName(), e.getMessage()));
+								dataPoint.getVO().getName(), e.getMessage()), dataPoint);
 				LOG.info("Error setting point value", e);
 			}
 		} catch (ErrorResponseException e) {
 			raiseEvent(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime(), true,
 					new LocalizableMessage("event.exception2", dataPoint
 							.getVO().getName(), e.getErrorResponse()
-							.getExceptionMessage()));
+							.getExceptionMessage()), dataPoint);
 			LOG.info("Error setting point value", e);
+		} catch (Throwable e) {
+			raiseEvent(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime(),
+					true, new LocalizableMessage("event.exception2",
+							dataPoint.getVO().getName(), e.getMessage()), dataPoint);
 		}
 	}
 
@@ -486,7 +486,7 @@ public static BaseLocator<?> createModbusLocator(ModbusPointLocatorVO vo) {
 				vo.getRegisterCount(), Charset.forName(vo.getCharset()));
 	}
 
-	public static LocalizableMessage localExceptionMessage(Exception e) {
+	public static LocalizableMessage localExceptionMessage(Throwable e) {
 		if (e instanceof ModbusTransportException) {
 			Throwable cause = e.getCause();
 			if (cause instanceof TimeoutException)
@@ -499,7 +499,7 @@ public static LocalizableMessage localExceptionMessage(Exception e) {
 		return DataSourceRT.getExceptionMessage(e);
 	}
 
-	protected LocalizableMessage getLocalExceptionMessage(Exception e) {
+	protected LocalizableMessage getLocalExceptionMessage(Throwable e) {
 		return localExceptionMessage(e);
 	}
 
diff --git a/src/com/serotonin/mango/rt/dataSource/modbus/ModbusSerialDataSource.java b/src/com/serotonin/mango/rt/dataSource/modbus/ModbusSerialDataSource.java
index c50b129b79..c0630c9b77 100644
--- a/src/com/serotonin/mango/rt/dataSource/modbus/ModbusSerialDataSource.java
+++ b/src/com/serotonin/mango/rt/dataSource/modbus/ModbusSerialDataSource.java
@@ -112,7 +112,7 @@ public boolean verifyPort(String port) {
 	}
 
 	@Override
-	protected LocalizableMessage getLocalExceptionMessage(Exception e) {
+	protected LocalizableMessage getLocalExceptionMessage(Throwable e) {
 		if (e instanceof ModbusInitException) {
 			Throwable cause = e.getCause();
 			if (cause instanceof NoSuchPortException)
diff --git a/src/com/serotonin/mango/rt/dataSource/nmea/NmeaDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/nmea/NmeaDataSourceRT.java
index 2fd36fad80..229480a1ff 100644
--- a/src/com/serotonin/mango/rt/dataSource/nmea/NmeaDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/nmea/NmeaDataSourceRT.java
@@ -91,7 +91,7 @@ synchronized private boolean initNmea() {
             // Deactivate any existing event.
             returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
         }
-        catch (Exception e) {
+        catch (Throwable e) {
             LocalizableMessage message = getSerialExceptionMessage(e, vo.getCommPortId());
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, message);
             log.debug("Error while initializing data source", e);
@@ -102,7 +102,8 @@ synchronized private boolean initNmea() {
     }
 
     synchronized private void termNmea() {
-        nmeaReceiver.terminate();
+        if(nmeaReceiver != null)
+            nmeaReceiver.terminate();
     }
 
     //
@@ -131,7 +132,7 @@ public void receivedMessage(NmeaMessage message) {
                     if (parseError == null)
                         parseError = e.getLocalizableMessage();
                 }
-                catch (Exception e) {
+                catch (Throwable e) {
                     if (parseError == null)
                         parseError = new LocalizableMessage("event.exception2", dp.getVO().getName(), e.getMessage());
                 }
@@ -139,7 +140,9 @@ public void receivedMessage(NmeaMessage message) {
         }
 
         if (parseError != null)
-            raiseEvent(PARSE_EXCEPTION_EVENT, time, false, parseError);
+            raiseEvent(PARSE_EXCEPTION_EVENT, time, true, parseError);
+        else
+            returnToNormal(PARSE_EXCEPTION_EVENT, time);
     }
 
     private void receivedMessageImpl(DataPointRT dp, NmeaMessage message, long time) throws Exception {
diff --git a/src/com/serotonin/mango/rt/dataSource/onewire/OneWireDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/onewire/OneWireDataSourceRT.java
index fcb8a2d38a..aee6c19a59 100644
--- a/src/com/serotonin/mango/rt/dataSource/onewire/OneWireDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/onewire/OneWireDataSourceRT.java
@@ -375,9 +375,11 @@ else if (attributeId == OneWirePointLocatorVO.AttributeTypes.WIPER_POSITION) {
 
             // Event handling.
             if (exceptionMessage != null)
-                raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), false, exceptionMessage);
-            else
+                raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), false, exceptionMessage, dataPoint);
+            else {
                 dataPoint.setPointValue(valueTime, source);
+                returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+            }
         }
     }
 
@@ -389,7 +391,6 @@ else if (attributeId == OneWirePointLocatorVO.AttributeTypes.WIPER_POSITION) {
     @Override
     public void initialize() {
         initializeNetwork();
-        super.initialize();
     }
 
     @Override
@@ -419,6 +420,7 @@ private void initializeNetwork() {
             terminateNetwork();
             return;
         }
+        super.initialize();
     }
 
     private void terminateNetwork() {
diff --git a/src/com/serotonin/mango/rt/dataSource/openv4j/OpenV4JDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/openv4j/OpenV4JDataSourceRT.java
index 5522392b74..eb2d7aa310 100644
--- a/src/com/serotonin/mango/rt/dataSource/openv4j/OpenV4JDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/openv4j/OpenV4JDataSourceRT.java
@@ -168,11 +168,11 @@ public synchronized void setPointValue(DataPointRT dataPoint, PointValueTime val
                     }
                     catch (InterruptedException ex) {
                         raiseEvent(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), true,
-                                new LocalizableMessage("openv4j.interrupted"));
+                                new LocalizableMessage("openv4j.interrupted"), dataPoint);
                     }
                 }
-                returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis());
-                returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+                returnToNormal(POINT_WRITE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+                returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
             }
             finally {
                 closePort();
diff --git a/src/com/serotonin/mango/rt/dataSource/pachube/PachubeDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/pachube/PachubeDataSourceRT.java
index 2bbb18ea17..1f80c33cb6 100644
--- a/src/com/serotonin/mango/rt/dataSource/pachube/PachubeDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/pachube/PachubeDataSourceRT.java
@@ -59,29 +59,42 @@
 import com.serotonin.web.i18n.LocalizableException;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.*;
 import static com.serotonin.mango.Common.createGetMethod;
 
 public class PachubeDataSourceRT extends PollingDataSource {
     public static final int DATA_RETRIEVAL_FAILURE_EVENT = 1;
     public static final int PARSE_EXCEPTION_EVENT = 2;
     public static final int POINT_WRITE_EXCEPTION_EVENT = 3;
+    public static final int INITIALIZATION_EXCEPTION_EVENT = 4;
 
     public static final String HEADER_API_KEY = "X-PachubeApiKey";
 
     final Log log = LogFactory.getLog(PachubeDataSourceRT.class);
     final PachubeDataSourceVO vo;
-    private final HttpClient httpClient;
-    final SimpleDateFormat sdf;
+    private HttpClient httpClient;
+    private SimpleDateFormat sdf;
 
     public PachubeDataSourceRT(PachubeDataSourceVO vo) {
         super(vo);
         setPollingPeriod(vo.getUpdatePeriodType(), vo.getUpdatePeriods(), false);
         this.vo = vo;
+    }
 
-        httpClient = createHttpClient(vo.getTimeoutSeconds(), vo.getRetries());
-
-        sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+    @Override
+    public void initialize() {
+        try {
+            httpClient = createHttpClient(vo.getTimeoutSeconds(), vo.getRetries());
+            sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+            sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+            returnToNormal(INITIALIZATION_EXCEPTION_EVENT, System.currentTimeMillis());
+        } catch (Throwable e) {
+            raiseEvent(INITIALIZATION_EXCEPTION_EVENT, System.currentTimeMillis(), true,
+                    new LocalizableMessage("event.exception2",
+                            vo.getName(), e.getMessage()));
+            return;
+        }
+        super.initialize();
     }
 
     public static HttpClient createHttpClient(int timeoutSeconds, int retries) {
@@ -94,12 +107,12 @@ public static HttpClient createHttpClient(int timeoutSeconds, int retries) {
     @Override
     public void addDataPoint(DataPointRT dataPoint) {
         super.addDataPoint(dataPoint);
-        dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+        setUnreliableDataPoint(dataPoint);
     }
 
     @Override
     public void removeDataPoint(DataPointRT dataPoint) {
-        returnToNormal(PARSE_EXCEPTION_EVENT, System.currentTimeMillis());
+        returnToNormal(PARSE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
         super.removeDataPoint(dataPoint);
     }
 
@@ -139,7 +152,7 @@ protected void pollFeed(int feedId, List<DataPointRT> points, long time) {
         try {
             data = getData(httpClient, feedId, vo.getApiKey());
         }
-        catch (Exception e) {
+        catch (Throwable e) {
             LocalizableMessage lm;
             if (e instanceof LocalizableException)
                 lm = ((LocalizableException) e).getLocalizableMessage();
@@ -147,10 +160,6 @@ protected void pollFeed(int feedId, List<DataPointRT> points, long time) {
                 lm = new LocalizableMessage("event.pachube.feed.retrievalError", feedId, e.getMessage());
             raiseEvent(DATA_RETRIEVAL_FAILURE_EVENT, time, true, lm);
 
-            // Mark points as unreliable.
-            for (DataPointRT point : points)
-                point.setAttribute(ATTR_UNRELIABLE_KEY, true);
-
             return;
         }
 
@@ -166,7 +175,6 @@ protected void pollFeed(int feedId, List<DataPointRT> points, long time) {
             if (dataValue == null) {
                 parseErrorMessage = new LocalizableMessage("event.pachube.dataStreamNotFound",
                         locator.getDataStreamId(), feedId);
-                dp.setAttribute(ATTR_UNRELIABLE_KEY, true);
             }
             else {
                 try {
@@ -187,24 +195,25 @@ protected void pollFeed(int feedId, List<DataPointRT> points, long time) {
                     // Save the new value if it is new
                     if (!ObjectUtils.isEqual(dp.getPointValue(), pvt))
                         dp.updatePointValue(new PointValueTime(value, valueTime));
-                    dp.setAttribute(ATTR_UNRELIABLE_KEY, false);
                 }
                 catch (LocalizableException e) {
                     if (parseErrorMessage == null)
                         parseErrorMessage = e.getLocalizableMessage();
-                    dp.setAttribute(ATTR_UNRELIABLE_KEY, true);
                 }
                 catch (ParseException e) {
                     if (parseErrorMessage == null)
                         parseErrorMessage = new LocalizableMessage("event.valueParse.timeParsePoint",
                                 dataValue.getTimestamp(), dp.getVO().getName());
-                    dp.setAttribute(ATTR_UNRELIABLE_KEY, true);
+                }
+                catch (Throwable e) {
+                    if (parseErrorMessage == null)
+                        parseErrorMessage = new LocalizableMessage("common.default", e.getMessage());
                 }
             }
         }
 
         if (parseErrorMessage != null)
-            raiseEvent(PARSE_EXCEPTION_EVENT, time, false, parseErrorMessage);
+            raiseEvent(PARSE_EXCEPTION_EVENT, time, true, parseErrorMessage);
         else
             returnToNormal(PARSE_EXCEPTION_EVENT, time);
     }
@@ -276,12 +285,12 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime, SetPo
             dataPoint.setPointValue(valueTime, source);
 
             // Deactivate any existing event.
-            returnToNormal(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime());
+            returnToNormal(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime(), dataPoint);
         }
         catch (IOException e) {
             // Raise an event.
             raiseEvent(POINT_WRITE_EXCEPTION_EVENT, valueTime.getTime(), true, new LocalizableMessage(
-                    "event.exception2", dataPoint.getVO().getName(), e.getMessage()));
+                    "event.exception2", dataPoint.getVO().getName(), e.getMessage()), dataPoint);
         }
     }
 }
diff --git a/src/com/serotonin/mango/rt/dataSource/persistent/PersistentDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/persistent/PersistentDataSourceRT.java
index 3c3419c8d2..2346257612 100644
--- a/src/com/serotonin/mango/rt/dataSource/persistent/PersistentDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/persistent/PersistentDataSourceRT.java
@@ -98,19 +98,19 @@ public long getPacketsReceived(int index) {
     //
     @Override
     public void initialize() {
-        super.initialize();
-
         try {
             serverSocket = new ServerSocket(vo.getPort());
             serverSocket.setSoTimeout(2000);
 
             returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
         }
-        catch (IOException e) {
+        catch (Throwable e) {
             serverSocket = null;
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
                     "event.initializationError", e.getMessage()));
+            return;
         }
+        super.initialize();
     }
 
     @Override
diff --git a/src/com/serotonin/mango/rt/dataSource/pop3/Pop3DataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/pop3/Pop3DataSourceRT.java
index 4950a9cb87..99d30e1292 100644
--- a/src/com/serotonin/mango/rt/dataSource/pop3/Pop3DataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/pop3/Pop3DataSourceRT.java
@@ -60,7 +60,7 @@ public Pop3DataSourceRT(Pop3DataSourceVO vo) {
 
     @Override
     public void removeDataPoint(DataPointRT dataPoint) {
-        returnToNormal(PARSE_EXCEPTION_EVENT, System.currentTimeMillis());
+        returnToNormal(PARSE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
     }
 
     @Override
@@ -123,19 +123,21 @@ protected void doPoll(long time) {
             returnToNormal(INBOX_EXCEPTION_EVENT, time);
 
             if (messagesRead) {
-                if (messageReadError != null)
-                    raiseEvent(MESSAGE_READ_EXCEPTION_EVENT, time, false, messageReadError);
-                else
+                if (messageReadError != null) {
+                    raiseEvent(MESSAGE_READ_EXCEPTION_EVENT, time, true, messageReadError);
+                    return;
+                } else
                     returnToNormal(MESSAGE_READ_EXCEPTION_EVENT, time);
 
-                if (parseError != null)
-                    raiseEvent(PARSE_EXCEPTION_EVENT, time, false, parseError);
-                else
+                if (parseError != null) {
+                    raiseEvent(PARSE_EXCEPTION_EVENT, time, true, parseError);
+                    return;
+                } else
                     returnToNormal(PARSE_EXCEPTION_EVENT, time);
             }
         }
         catch (Exception e) {
-            raiseEvent(INBOX_EXCEPTION_EVENT, time, false, new LocalizableMessage("common.default", e.getMessage()));
+            raiseEvent(INBOX_EXCEPTION_EVENT, time, true, new LocalizableMessage("common.default", e.getMessage()));
         }
         finally {
             try {
diff --git a/src/com/serotonin/mango/rt/dataSource/snmp/SnmpDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/snmp/SnmpDataSourceRT.java
index 1de498569a..2598033a8c 100644
--- a/src/com/serotonin/mango/rt/dataSource/snmp/SnmpDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/snmp/SnmpDataSourceRT.java
@@ -31,6 +31,8 @@
 
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.setUnreliableDataPoints;
+
 /**
  * @author Matthew Lohbihler
  *
@@ -106,7 +108,7 @@ private void finishTime(){
     private final Log log = LogFactory.getLog(SnmpDataSourceRT.class);
 
     private final SnmpDataSourceVO vo;
-    private final Version version;
+    private Version version;
     private String address;
     private Target target;
     private Snmp snmp;
@@ -122,12 +124,6 @@ public SnmpDataSourceRT(SnmpDataSourceVO vo) {
         super(vo);
         setPollingPeriod(vo.getUpdatePeriodType(), vo.getUpdatePeriods(), false);
         this.vo = vo;
-        version = Version.getVersion(vo.getSnmpVersion(), vo.getCommunity(),
-                vo.getSecurityName(), vo.getAuthProtocol(),
-                vo.getAuthPassphrase(), vo.getPrivProtocol(),
-                vo.getPrivPassphrase(), vo.getSecurityLevel(),
-                vo.getContextName());
-        snmpRequests = new SnmpResponses();
     }
 
     @Override
@@ -141,10 +137,12 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime,
         PDU response = snmpRequests.getResponseBySet();
 
         LocalizableMessage message = validatePdu(response);
-        if (message != null)
-            raiseEvent(PDU_EXCEPTION_EVENT, valueTime.getTime(), false, message);
-        else
+        if (message != null) {
+            raiseEvent(PDU_EXCEPTION_EVENT, valueTime.getTime(), false, message, dataPoint);
+        } else {
             dataPoint.setPointValue(valueTime, source);
+            returnToNormal(PDU_EXCEPTION_EVENT, valueTime.getTime(), dataPoint);
+        }
     }
     public void setDeviceDidNotRespondDespiteTheCounterOfRetries(boolean deviceDidNotRespondDespiteTheCounterOfRetries) {
         this.deviceDidNotRespondDespiteTheCounterOfRetries = deviceDidNotRespondDespiteTheCounterOfRetries;
@@ -209,6 +207,7 @@ private void doPollImpl(long time) throws IOException {
                 }
             } else {
                 if (!isSnmpConnectionIsAlive()) {
+                    setUnreliableDataPoints(dataPoints);
 //                    Common.ctx.getRuntimeManager().stopDataSourceAndDontJoinTermination(vo.getId());
                 } else if (message != null) {
                     raiseEvent(PDU_EXCEPTION_EVENT, time, true, message);
@@ -226,7 +225,6 @@ private void doPollImpl(long time) throws IOException {
                 }
             } else {
                 raiseEvent(PDU_EXCEPTION_EVENT, time, true, validatePdu(response));
-
             }
         }
 
@@ -273,8 +271,9 @@ private boolean logEventsDependsOnMessageType(MessageType messageType, VariableB
                 break;
         }
 
-        if(messageType!=MessageType.undefined)
-            raiseEvent(PDU_EXCEPTION_EVENT,time,true,message);
+        if(messageType!=MessageType.undefined) {
+            raiseEvent(PDU_EXCEPTION_EVENT, time, true, message);
+        }
 
         return messageType!=MessageType.undefined;
     }
@@ -334,9 +333,9 @@ void receivedTrap(PDU trap) {
 
         // Take a look at the response.
         LocalizableMessage message = validatePdu(trap);
-        if (message != null)
-            raiseEvent(PDU_EXCEPTION_EVENT, time, false, message);
-        else {
+        if (message != null) {
+            raiseEvent(PDU_EXCEPTION_EVENT, time, true, message);
+        } else {
             synchronized (pointListChangeLock) {
                 updateChangedPoints();
 
@@ -352,9 +351,12 @@ void receivedTrap(PDU trap) {
                         }
                     }
 
-                    if (!found)
-						raiseEvent(TRAP_NOT_HANDLED_EVENT, time, false, new LocalizableMessage("event.snmp.trapNotHandled", vb));
+                    if (!found) {
                         log.warn("Trap not handled: " + vb);
+                        raiseEvent(TRAP_NOT_HANDLED_EVENT, time, true, new LocalizableMessage("event.snmp.trapNotHandled", vb));
+                    } else {
+                        returnToNormal(TRAP_NOT_HANDLED_EVENT, time);
+                    }
                 }
             }
         }
@@ -364,6 +366,7 @@ private void updatePoint(DataPointRT dp, Variable variable, long time) {
         SnmpPointLocatorRT locator = dp.getPointLocator();
         dp.updatePointValue(new PointValueTime(locator
                 .variableToValue(variable), time));
+        returnToNormal(PDU_EXCEPTION_EVENT, time, dp);
     }
 
     //
@@ -374,6 +377,12 @@ private void updatePoint(DataPointRT dp, Variable variable, long time) {
     @Override
     public void initialize() {
         try {
+            version = Version.getVersion(vo.getSnmpVersion(), vo.getCommunity(),
+                    vo.getSecurityName(), vo.getAuthProtocol(),
+                    vo.getAuthPassphrase(), vo.getPrivProtocol(),
+                    vo.getPrivPassphrase(), vo.getSecurityLevel(),
+                    vo.getContextName());
+            snmpRequests = new SnmpResponses();
             initializeComponents();
             counterEmptyResponsesOrResponsesWithError=0;
             log.info("Counter Empty Responses Or Responses With Error is set 0.");
@@ -383,7 +392,7 @@ public void initialize() {
             // Deactivate any existing event.
             returnToNormal(DATA_SOURCE_EXCEPTION_EVENT,
                     System.currentTimeMillis());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(),
                     true, DataSourceRT.getExceptionMessage(e));
             log.debug("Error while initializing data source", e);
diff --git a/src/com/serotonin/mango/rt/dataSource/sql/SqlDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/sql/SqlDataSourceRT.java
index dc9d7a1a62..0d1fa13fbe 100644
--- a/src/com/serotonin/mango/rt/dataSource/sql/SqlDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/sql/SqlDataSourceRT.java
@@ -101,15 +101,17 @@ else if (locatorVO.getDataTypeId() == DataTypes.IMAGE) {
 			int rows = jdbcOperations.update(locatorVO.getUpdateStatement(), value);
 			if (rows == 0) {
 				raiseEvent(STATEMENT_EXCEPTION_EVENT, valueTime.getTime(),
-						false, new LocalizableMessage(
+						true, new LocalizableMessage(
 								"event.sql.noRowsUpdated", dataPoint.getVO()
-										.getName()));
-			} else
+										.getName()), dataPoint);
+			} else {
 				dataPoint.setPointValue(valueTime, source);
+				returnToNormal(STATEMENT_EXCEPTION_EVENT, valueTime.getTime());
+			}
 		} catch (Exception e) {
-			raiseEvent(STATEMENT_EXCEPTION_EVENT, valueTime.getTime(), false,
+			raiseEvent(STATEMENT_EXCEPTION_EVENT, valueTime.getTime(), true,
 					new LocalizableMessage("event.sql.setError", dataPoint
-							.getVO().getName(), getExceptionMessage(e)));
+							.getVO().getName(), getExceptionMessage(e)), dataPoint);
 		}
 	}
 
@@ -194,8 +196,10 @@ private void updateByColumn(long time, ResultSet rs) throws SQLException {
 							raiseEvent(STATEMENT_EXCEPTION_EVENT, time, true,
 									new LocalizableMessage(
 											"event.sql.timeNotFound",
-											timeOverride));
+											timeOverride), dp);
 							continue;
+						} else {
+							returnToNormal(STATEMENT_EXCEPTION_EVENT, time, dp);
 						}
 
 						pointTime = getTimeOverride(meta, column, rs, time);
@@ -258,6 +262,8 @@ private void updateByRowId(long time, ResultSet rs) throws SQLException {
 			if (!found)
 				raiseEvent(STATEMENT_EXCEPTION_EVENT, time, true,
 						new LocalizableMessage("event.sql.noDataPoint", rowId));
+			else
+				returnToNormal(STATEMENT_EXCEPTION_EVENT, time);
 		}
 	}
 
diff --git a/src/com/serotonin/mango/rt/dataSource/viconics/ViconicsDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/viconics/ViconicsDataSourceRT.java
index bcd6e9b2e1..00871415e4 100644
--- a/src/com/serotonin/mango/rt/dataSource/viconics/ViconicsDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/viconics/ViconicsDataSourceRT.java
@@ -75,6 +75,8 @@
 import com.serotonin.viconics.io.ViconicsOutgoingRequest;
 import com.serotonin.web.i18n.LocalizableMessage;
 
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.*;
+
 /**
  * @author Matthew Lohbihler
  */
@@ -108,7 +110,7 @@ public ViconicsDataSourceRT(ViconicsDataSourceVO vo) {
 	public void initialize() {
 		try {
 			network = new ViconicsNetwork(vo.getCommPortId(), Common.timer);
-		} catch (ViconicsConfigurationException e) {
+		} catch (Throwable e) {
 			raiseEvent(INITIALIZATION_EXCEPTION_EVENT,
 					System.currentTimeMillis(), true, new LocalizableMessage(
 							"event.initializationError", e.getMessage()));
@@ -127,7 +129,7 @@ public void initialize() {
 		try {
 			network.init();
 			network.startNetwork(vo.getPanId(), vo.getChannel());
-		} catch (Exception e) {
+		} catch (Throwable e) {
 			raiseEvent(INITIALIZATION_EXCEPTION_EVENT,
 					System.currentTimeMillis(), true, new LocalizableMessage(
 							"event.initializationError", e.getMessage()));
@@ -147,7 +149,7 @@ public void addDataPoint(DataPointRT dataPoint) {
 		super.addDataPoint(dataPoint);
 
 		// Mark the point as unreliable.
-		dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+		setUnreliableDataPoint(dataPoint);
 
 		// Add the point to the lookup map.
 		pointLookup.put(new PointKey(dataPoint), dataPoint);
@@ -176,12 +178,6 @@ public void terminate() {
 	// / ViconicsNetworkListener
 	//
 	public void viconicsNetworkStatus(boolean online) {
-		// Mark all points as unreliable.
-		synchronized (dataPoints) {
-			for (DataPointRT rt : dataPoints)
-				rt.setAttribute(ATTR_UNRELIABLE_KEY, true);
-		}
-
 		if (online)
 			returnToNormal(NETWORK_OFFLINE_EVENT, System.currentTimeMillis());
 		else
@@ -386,17 +382,6 @@ public void viconicsDeviceStatus(ViconicsDevice device, boolean online) {
 		if (online)
 			returnToNormal(DEVICE_OFFLINE_EVENT, System.currentTimeMillis());
 		else {
-			// Mark all points for the device as unreliable.
-			synchronized (dataPoints) {
-				for (DataPointRT rt : dataPoints) {
-					ViconicsPointLocatorVO locator = rt.getVO()
-							.getPointLocator();
-					if (Arrays
-							.equals(locator.getDeviceIeee(), device.getIeee()))
-						rt.setAttribute(ATTR_UNRELIABLE_KEY, true);
-				}
-			}
-
 			raiseEvent(DEVICE_OFFLINE_EVENT, System.currentTimeMillis(), true,
 					new LocalizableMessage("event.viconics.deviceOffline",
 							device.getIeeeString()));
@@ -427,7 +412,7 @@ public void viconicsReceivedException(Exception e) {
 		raiseEvent(
 				MESSAGE_EXCEPTION_EVENT,
 				System.currentTimeMillis(),
-				false,
+				true,
 				new LocalizableMessage("event.viconics.messagingException", e
 						.getMessage()));
 	}
@@ -472,14 +457,13 @@ public void viconicsDevicePointUpdated(ViconicsDevice device,
 			throw new ShouldNeverHappenException("Unknown point type: "
 					+ point.getClass());
 
-		rt.setAttribute(ATTR_UNRELIABLE_KEY, false);
-
 		rt.updatePointValue(new PointValueTime(mangoValue, time));
+		resetUnreliableDataPoint(rt);
 	}
 
 	public void viconicsDuplicateCommAddressDetected(int commAddress) {
 		raiseEvent(DUPLICATE_COMM_ADDRESS_EVENT, System.currentTimeMillis(),
-				false, new LocalizableMessage(
+				true, new LocalizableMessage(
 						"event.viconics.messagingException", commAddress));
 	}
 
@@ -509,13 +493,14 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime pvt,
 			network.writeValue(locator.getDeviceIeee(),
 					locator.getPointAddress(), value);
 			dataPoint.setPointValue(pvt, source);
-		} catch (Exception e) {
+			returnToNormal(MESSAGE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+		} catch (Throwable e) {
 			raiseEvent(
 					MESSAGE_EXCEPTION_EVENT,
 					System.currentTimeMillis(),
-					false,
+					true,
 					new LocalizableMessage("event.setPointFailed", e
-							.getMessage()));
+							.getMessage()), dataPoint);
 		}
 	}
 
@@ -527,13 +512,14 @@ public void forcePointRead(DataPointRT dataPoint) {
 			// Ignore the result. It will be sent via the listener anyway.
 			network.readValue(locator.getDeviceIeee(),
 					locator.getPointAddress());
-		} catch (Exception e) {
+			returnToNormal(MESSAGE_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+		} catch (Throwable e) {
 			raiseEvent(
 					MESSAGE_EXCEPTION_EVENT,
 					System.currentTimeMillis(),
-					false,
+					true,
 					new LocalizableMessage("event.readPointFailed", e
-							.getMessage()));
+							.getMessage()), dataPoint);
 		}
 	}
 
diff --git a/src/com/serotonin/mango/rt/dataSource/vmstat/VMStatDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/vmstat/VMStatDataSourceRT.java
index e2cfd42874..9ff2fc32c1 100644
--- a/src/com/serotonin/mango/rt/dataSource/vmstat/VMStatDataSourceRT.java
+++ b/src/com/serotonin/mango/rt/dataSource/vmstat/VMStatDataSourceRT.java
@@ -60,7 +60,6 @@ public VMStatDataSourceRT(VMStatDataSourceVO vo) {
     //
     @Override
     public void initialize() {
-        super.initialize();
 
         String command = "vmstat -n ";
         switch (vo.getOutputScale()) {
@@ -140,10 +139,12 @@ else if ("st".equals(headerParts[i]))
 
             returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
         }
-        catch (IOException e) {
+        catch (Throwable e) {
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(), true, new LocalizableMessage(
                     "event.initializationError", e.getMessage()));
+            return;
         }
+        super.initialize();
     }
 
     @Override
diff --git a/src/com/serotonin/mango/rt/event/EventInstance.java b/src/com/serotonin/mango/rt/event/EventInstance.java
index a8cb1bda4b..c1c9650ec0 100644
--- a/src/com/serotonin/mango/rt/event/EventInstance.java
+++ b/src/com/serotonin/mango/rt/event/EventInstance.java
@@ -97,6 +97,9 @@ public interface AlternateAcknowledgementSources {
     private String acknowledgedByUsername;
     private int alternateAckSource;
 
+    private long assigneeTimestamp;
+    private String assigneeUsername;
+
     //
     //
     // These fields are used only in the context of access by a particular user, providing state filled in from
@@ -185,6 +188,14 @@ public LocalizableMessage getAckMessage() {
         return new LocalizableMessage("event.auto.acknowledge");
     }
 
+    public LocalizableMessage getAssigneeMessage() {
+        if (isAssignee()) {
+            if (!StringUtils.isEmpty(assigneeUsername))
+                return new LocalizableMessage("events.assigneeByUser", assigneeUsername);
+        }
+        return new LocalizableMessage("common.noMessage");
+    }
+
     public LocalizableMessage getExportAckMessage() {
         if (isAcknowledged()) {
             if (acknowledgedByUserId != 0 || !StringUtils.isEmpty(acknowledgedByUsername))
@@ -246,6 +257,10 @@ public boolean isAcknowledged() {
         return acknowledgedTimestamp > 0;
     }
 
+    public boolean isAssignee() {
+        return assigneeTimestamp > 0;
+    }
+
     public long getActiveTimestamp() {
         return activeTimestamp;
     }
@@ -350,6 +365,22 @@ public void setAlternateAckSource(int alternateAckSource) {
         this.alternateAckSource = alternateAckSource;
     }
 
+    public long getAssigneeTimestamp() {
+        return assigneeTimestamp;
+    }
+
+    public void setAssigneeTimestamp(long assigneeTimestamp) {
+        this.assigneeTimestamp = assigneeTimestamp;
+    }
+
+    public String getAssigneeUsername() {
+        return assigneeUsername;
+    }
+
+    public void setAssigneeUsername(String assigneeUsername) {
+        this.assigneeUsername = assigneeUsername;
+    }
+
     public Map<String, Object> getContext() {
         return context;
     }
@@ -459,6 +490,8 @@ public EventInstance copyWithContext(Map<String, Object> context) {
         eventInstance.setHandlers(handlers);
         eventInstance.setSilenced(silenced);
         eventInstance.setUserNotified(userNotified);
+        eventInstance.setAssigneeTimestamp(assigneeTimestamp);
+        eventInstance.setAssigneeUsername(assigneeUsername);
         return eventInstance;
     }
 
diff --git a/src/com/serotonin/mango/rt/event/type/DataSourceEventType.java b/src/com/serotonin/mango/rt/event/type/DataSourceEventType.java
index 8bab31d912..ba912b8a2a 100644
--- a/src/com/serotonin/mango/rt/event/type/DataSourceEventType.java
+++ b/src/com/serotonin/mango/rt/event/type/DataSourceEventType.java
@@ -19,6 +19,7 @@
 package com.serotonin.mango.rt.event.type;
 
 import java.util.Map;
+import java.util.Objects;
 
 import com.serotonin.json.JsonException;
 import com.serotonin.json.JsonObject;
@@ -93,28 +94,16 @@ public int getReferenceId2() {
     }
 
     @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + dataSourceEventTypeId;
-        result = prime * result + dataSourceId;
-        return result;
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof DataSourceEventType)) return false;
+        DataSourceEventType that = (DataSourceEventType) o;
+        return getDataSourceId() == that.getDataSourceId() && getDataSourceEventTypeId() == that.getDataSourceEventTypeId() && getAlarmLevel() == that.getAlarmLevel() && getDuplicateHandling() == that.getDuplicateHandling();
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        DataSourceEventType other = (DataSourceEventType) obj;
-        if (dataSourceEventTypeId != other.dataSourceEventTypeId)
-            return false;
-        if (dataSourceId != other.dataSourceId)
-            return false;
-        return true;
+    public int hashCode() {
+        return Objects.hash(getDataSourceId(), getDataSourceEventTypeId(), getAlarmLevel(), getDuplicateHandling());
     }
 
     //
diff --git a/src/com/serotonin/mango/rt/event/type/DataSourcePointEventType.java b/src/com/serotonin/mango/rt/event/type/DataSourcePointEventType.java
new file mode 100644
index 0000000000..f0a04b54b9
--- /dev/null
+++ b/src/com/serotonin/mango/rt/event/type/DataSourcePointEventType.java
@@ -0,0 +1,144 @@
+/*
+    Mango - Open Source M2M - http://mango.serotoninsoftware.com
+    Copyright (C) 2006-2011 Serotonin Software Technologies Inc.
+    @author Matthew Lohbihler
+    
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.serotonin.mango.rt.event.type;
+
+import com.serotonin.json.JsonException;
+import com.serotonin.json.JsonObject;
+import com.serotonin.json.JsonReader;
+import com.serotonin.json.JsonRemoteEntity;
+import com.serotonin.mango.vo.DataPointVO;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.scada_lts.mango.service.DataPointService;
+
+import java.util.Map;
+import java.util.Objects;
+
+@JsonRemoteEntity
+public class DataSourcePointEventType extends DataSourceEventType {
+
+    private DataSourceEventType dataSourceEventType;
+    private int dataPointId;
+    private final int duplicateHandling = DuplicateHandling.IGNORE_SAME_MESSAGE;
+
+    private final Log LOG = LogFactory.getLog(DataSourcePointEventType.class);
+
+    public DataSourcePointEventType() {
+        // Required for reflection.
+    }
+
+    public DataSourcePointEventType(DataSourceEventType dataSourceEventType, int dataPointId) {
+        this.dataSourceEventType = dataSourceEventType;
+        this.dataPointId = dataPointId;
+    }
+
+    @Override
+    public int getEventSourceId() {
+        return EventSources.DATA_SOURCE_POINT;
+    }
+
+    @Override
+    public int getDataSourceEventTypeId() {
+        return dataSourceEventType.getDataSourceEventTypeId();
+    }
+
+    @Override
+    public int getAlarmLevel() {
+        return dataSourceEventType.getAlarmLevel();
+    }
+
+    @Override
+    public int getDataSourceId() {
+        return dataSourceEventType.getDataSourceId();
+    }
+
+    @Override
+    public int getDataPointId() {
+        return dataPointId;
+    }
+
+    @Override
+    public String toString() {
+        return "DataSoureEventType(dataSourceId=" + dataSourceEventType.getDataSourceId() + ", dataPointId=" + dataPointId + ", eventTypeId=" + dataSourceEventType.getDataSourceEventTypeId() + ")";
+    }
+
+    @Override
+    public int getDuplicateHandling() {
+        return duplicateHandling;
+    }
+
+    @Override
+    public int getReferenceId1() {
+        return dataSourceEventType.getDataSourceId();
+    }
+
+    @Override
+    public int getReferenceId2() {
+        return dataSourceEventType.getDataSourceEventTypeId();
+    }
+
+    @Override
+    public int getReferenceId3() {
+        return dataPointId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DataSourcePointEventType that = (DataSourcePointEventType) o;
+        return dataPointId == that.dataPointId && Objects.equals(dataSourceEventType, that.dataSourceEventType);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(dataSourceEventType, dataPointId);
+    }
+
+    //
+    // /
+    // / Serialization
+    // /
+    //
+    @Override
+    public void jsonSerialize(Map<String, Object> map) {
+        super.jsonSerialize(map);
+        dataSourceEventType.jsonSerialize(map);
+        DataPointService dataPointService = new DataPointService();
+        DataPointVO dataPoint = dataPointService.getDataPoint(dataPointId);
+        if(dataPoint != null) {
+            map.put("DATA_POINT_XID", dataPoint.getXid());
+        } else {
+            LOG.error("DataPoint for id: " + dataPointId + " does not exist.");
+        }
+    }
+
+    @Override
+    public void jsonDeserialize(JsonReader reader, JsonObject json) throws JsonException {
+        super.jsonDeserialize(reader, json);
+        DataSourceEventType dataSourceEventType = new DataSourceEventType();
+        dataSourceEventType.jsonDeserialize(reader, json);
+        this.dataSourceEventType = dataSourceEventType;
+
+        DataPointVO dataPoint = getDataPoint(json, "DATA_POINT_XID");
+        if(dataPoint != null) {
+            dataPointId = dataPoint.getId();
+        }
+    }
+}
diff --git a/src/com/serotonin/mango/rt/event/type/EventType.java b/src/com/serotonin/mango/rt/event/type/EventType.java
index b1b627636a..e35e0745a0 100644
--- a/src/com/serotonin/mango/rt/event/type/EventType.java
+++ b/src/com/serotonin/mango/rt/event/type/EventType.java
@@ -27,7 +27,6 @@
 import com.serotonin.json.JsonSerializable;
 import com.serotonin.mango.db.dao.CompoundEventDetectorDao;
 import com.serotonin.mango.db.dao.DataPointDao;
-import com.serotonin.mango.db.dao.DataSourceDao;
 import com.serotonin.mango.db.dao.MaintenanceEventDao;
 import com.serotonin.mango.db.dao.PublisherDao;
 import com.serotonin.mango.db.dao.ScheduledEventDao;
@@ -40,6 +39,8 @@
 import com.serotonin.mango.vo.event.MaintenanceEventVO;
 import com.serotonin.mango.vo.event.ScheduledEventVO;
 import com.serotonin.mango.vo.publish.PublisherVO;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.mango.service.DataSourceService;
 
 /**
  * An event class specifies the type of event that was raised.
@@ -102,6 +103,8 @@ public interface EventSources {
          * Maintenance events are created when maintenance mode becomes active. See MaintenanceVO for more information.
          */
         int MAINTENANCE = 9;
+
+        int DATA_SOURCE_POINT = 10;
     }
 
     public static final ExportCodes SOURCE_CODES = new ExportCodes();
@@ -114,6 +117,7 @@ public interface EventSources {
         SOURCE_CODES.addElement(EventSources.PUBLISHER, "PUBLISHER");
         SOURCE_CODES.addElement(EventSources.AUDIT, "AUDIT");
         SOURCE_CODES.addElement(EventSources.MAINTENANCE, "MAINTENANCE");
+        SOURCE_CODES.addElement(EventSources.DATA_SOURCE_POINT, "DATA_SOURCE_POINT");
     }
 
     /**
@@ -225,6 +229,10 @@ public int getSystemEventTypeId() {
 
     abstract public int getReferenceId2();
 
+    public int getReferenceId3() {
+        return -1;
+    }
+
     /**
      * Determines if the notification of this event to the given user should be suppressed. Useful if the action of the
      * user resulted in the event being raised.
@@ -276,9 +284,7 @@ protected int getInt(JsonObject json, String name, ExportCodes codes) throws Jso
     // }
     //
     protected int getCompoundEventDetectorId(JsonObject json, String name) throws JsonException {
-        String xid = json.getString(name);
-        if (xid == null)
-            throw new LocalizableJsonException("emport.error.eventType.missing.reference", name);
+        String xid = getXid(json, name);
         CompoundEventDetectorVO ced = new CompoundEventDetectorDao().getCompoundEventDetector(xid);
         if (ced == null)
             throw new LocalizableJsonException("emport.error.eventType.invalid.reference", name, xid);
@@ -296,9 +302,7 @@ protected int getCompoundEventDetectorId(JsonObject json, String name) throws Js
     // }
     //
     protected int getScheduledEventId(JsonObject json, String name) throws JsonException {
-        String xid = json.getString(name);
-        if (xid == null)
-            throw new LocalizableJsonException("emport.error.eventType.missing.reference", name);
+        String xid = getXid(json, name);
         ScheduledEventVO se = new ScheduledEventDao().getScheduledEvent(xid);
         if (se == null)
             throw new LocalizableJsonException("emport.error.eventType.invalid.reference", name, xid);
@@ -306,9 +310,7 @@ protected int getScheduledEventId(JsonObject json, String name) throws JsonExcep
     }
 
     protected int getDataPointId(JsonObject json, String name) throws JsonException {
-        String xid = json.getString(name);
-        if (xid == null)
-            throw new LocalizableJsonException("emport.error.eventType.missing.reference", name);
+        String xid = getXid(json, name);
         DataPointVO dp = new DataPointDao().getDataPoint(xid);
         if (dp == null)
             throw new LocalizableJsonException("emport.error.eventType.invalid.reference", name, xid);
@@ -330,9 +332,7 @@ protected int getPointEventDetectorId(JsonObject json, String dpName, String ped
     }
 
     protected int getPointEventDetectorId(JsonObject json, int dpId, String pedName) throws JsonException {
-        String pedXid = json.getString(pedName);
-        if (pedXid == null)
-            throw new LocalizableJsonException("emport.error.eventType.missing.reference", pedName);
+        String pedXid = getXid(json, pedName);
         int id = new DataPointDao().getDetectorId(pedXid, dpId);
         if (id == -1)
             throw new LocalizableJsonException("emport.error.eventType.invalid.reference", pedName, pedXid);
@@ -341,19 +341,25 @@ protected int getPointEventDetectorId(JsonObject json, int dpId, String pedName)
     }
 
     protected DataSourceVO<?> getDataSource(JsonObject json, String name) throws JsonException {
-        String xid = json.getString(name);
-        if (xid == null)
-            throw new LocalizableJsonException("emport.error.eventType.missing.reference", name);
-        DataSourceVO<?> ds = new DataSourceDao().getDataSource(xid);
+        String xid = getXid(json, name);
+        DataSourceService dataSourceService = new DataSourceService();
+        DataSourceVO<?> ds = dataSourceService.getDataSource(xid);
         if (ds == null)
             throw new LocalizableJsonException("emport.error.eventType.invalid.reference", name, xid);
         return ds;
     }
 
+    protected DataPointVO getDataPoint(JsonObject json, String name) throws JsonException {
+        String xid = getXid(json, name);
+        DataPointService dataPointService = new DataPointService();
+        DataPointVO dataPoint = dataPointService.getDataPoint(xid);
+        if (dataPoint == null)
+            throw new LocalizableJsonException("emport.error.eventType.invalid.reference", name, xid);
+        return dataPoint;
+    }
+
     protected PublisherVO<?> getPublisher(JsonObject json, String name) throws JsonException {
-        String xid = json.getString(name);
-        if (xid == null)
-            throw new LocalizableJsonException("emport.error.eventType.missing.reference", name);
+        String xid = getXid(json, name);
         PublisherVO<?> pb = new PublisherDao().getPublisher(xid);
         if (pb == null)
             throw new LocalizableJsonException("emport.error.eventType.invalid.reference", name, xid);
@@ -361,12 +367,17 @@ protected PublisherVO<?> getPublisher(JsonObject json, String name) throws JsonE
     }
 
     protected int getMaintenanceEventId(JsonObject json, String name) throws JsonException {
-        String xid = json.getString(name);
-        if (xid == null)
-            throw new LocalizableJsonException("emport.error.eventType.missing.reference", name);
+        String xid = getXid(json, name);
         MaintenanceEventVO me = new MaintenanceEventDao().getMaintenanceEvent(xid);
         if (me == null)
             throw new LocalizableJsonException("emport.error.eventType.invalid.reference", name, xid);
         return me.getId();
     }
+
+    private static String getXid(JsonObject json, String name) throws LocalizableJsonException {
+        String xid = json.getString(name);
+        if (xid == null)
+            throw new LocalizableJsonException("emport.error.eventType.missing.reference", name);
+        return xid;
+    }
 }
diff --git a/src/com/serotonin/mango/rt/event/type/SystemEventType.java b/src/com/serotonin/mango/rt/event/type/SystemEventType.java
index 39f4019a58..754ea64dd5 100644
--- a/src/com/serotonin/mango/rt/event/type/SystemEventType.java
+++ b/src/com/serotonin/mango/rt/event/type/SystemEventType.java
@@ -60,6 +60,8 @@ public class SystemEventType extends EventType {
 	public static final int TYPE_PROCESS_FAILURE = 10;
 	public static final int TYPE_SCRIPT_HANDLER_FAILURE = 11;
 	public static final int TYPE_SMS_SEND_FAILURE = 12;
+	public static final int TYPE_ASSIGNED_EVENT = 13;
+	public static final int TYPE_UNASSIGNED_EVENT = 14;
 
 	public static final ExportCodes TYPE_CODES = new ExportCodes();
 	static {
@@ -78,6 +80,8 @@ public class SystemEventType extends EventType {
 		TYPE_CODES.addElement(TYPE_PROCESS_FAILURE, "PROCESS_FAILURE");
 		TYPE_CODES.addElement(TYPE_SCRIPT_HANDLER_FAILURE, "SCRIPT_HANDLER_FAILURE");
 		TYPE_CODES.addElement(TYPE_SMS_SEND_FAILURE, "SMS_SEND_FAILURE");
+		TYPE_CODES.addElement(TYPE_ASSIGNED_EVENT, "ASSIGNED_EVENT");
+		TYPE_CODES.addElement(TYPE_UNASSIGNED_EVENT, "UNASSIGNED_EVENT");
 	}
 
 	private static List<EventTypeVO> systemEventTypes;
@@ -109,7 +113,11 @@ public static List<EventTypeVO> getSystemEventTypes() {
 			addEventTypeVO(TYPE_SCRIPT_HANDLER_FAILURE, "event.system.script",
 					AlarmLevels.URGENT);
 			addEventTypeVO(TYPE_SMS_SEND_FAILURE, "event.system.sms",
-					AlarmLevels.URGENT);
+					AlarmLevels.INFORMATION);
+			addEventTypeVO(TYPE_ASSIGNED_EVENT, "event.system.assigned",
+					AlarmLevels.INFORMATION);
+			addEventTypeVO(TYPE_UNASSIGNED_EVENT, "event.system.unassigned",
+					AlarmLevels.INFORMATION);
 		}
 		return systemEventTypes;
 	}
diff --git a/src/com/serotonin/mango/rt/maint/work/AbstractBeforeAfterWorkItem.java b/src/com/serotonin/mango/rt/maint/work/AbstractBeforeAfterWorkItem.java
index 9bd311d220..afd33d2799 100644
--- a/src/com/serotonin/mango/rt/maint/work/AbstractBeforeAfterWorkItem.java
+++ b/src/com/serotonin/mango/rt/maint/work/AbstractBeforeAfterWorkItem.java
@@ -341,4 +341,18 @@ private static String exceptionsToString(Map<String, Throwable> exceptions) {
     private static boolean isEnabled(SystemSettingsService systemSettingsService) {
         return systemSettingsService.isWorkItemsReportingEnabled();
     }
+
+    @Override
+    public String toString() {
+        return "AbstractBeforeAfterWorkItem{" +
+                "createdDate=" + createdDate +
+                ", success=" + success +
+                ", workFailed=" + workFailed +
+                ", running=" + running +
+                ", threadName=\"" + threadName + '\"' +
+                ", failedMessage=\"" + failedMessage + '\"' +
+                ", startedDate=" + startedDate +
+                ", executedDate=" + executedDate +
+                '}';
+    }
 }
diff --git a/src/com/serotonin/mango/rt/maint/work/ReportWorkItem.java b/src/com/serotonin/mango/rt/maint/work/ReportWorkItem.java
index ab69dbf16a..6211de6b57 100644
--- a/src/com/serotonin/mango/rt/maint/work/ReportWorkItem.java
+++ b/src/com/serotonin/mango/rt/maint/work/ReportWorkItem.java
@@ -54,6 +54,7 @@
 import com.serotonin.util.StringUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
 import org.scada_lts.dao.report.ReportInstancePointDAO;
+import org.scada_lts.mango.service.SystemSettingsService;
 
 import static com.serotonin.mango.util.LoggingUtils.*;
 import static com.serotonin.mango.util.SendUtils.sendMsg;
@@ -207,8 +208,9 @@ public void workSuccess() {
 			String inlinePrefix = "R" + System.currentTimeMillis() + "-"
 					+ reportInstance.getId() + "-";
 
+			SystemSettingsService service = new SystemSettingsService();
 			// We are creating an email from the result. Create the content.
-			final ReportChartCreator creator = new ReportChartCreator(bundle);
+			final ReportChartCreator creator = new ReportChartCreator(bundle, service);
 			creator.createContent(reportInstance, reportDao, inlinePrefix,
 					reportConfig.isIncludeData());
 
diff --git a/src/com/serotonin/mango/rt/maint/work/WorkItems.java b/src/com/serotonin/mango/rt/maint/work/WorkItems.java
index 052ccf7f83..269caf2781 100644
--- a/src/com/serotonin/mango/rt/maint/work/WorkItems.java
+++ b/src/com/serotonin/mango/rt/maint/work/WorkItems.java
@@ -4,14 +4,12 @@
 import org.scada_lts.quartz.ReadItemsPerSecond;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 class WorkItems implements ReadWorkItems {
 
diff --git a/src/com/serotonin/mango/rt/publish/httpSender/HttpSenderRT.java b/src/com/serotonin/mango/rt/publish/httpSender/HttpSenderRT.java
index 4f085fd5fd..6b5ba1f1a7 100644
--- a/src/com/serotonin/mango/rt/publish/httpSender/HttpSenderRT.java
+++ b/src/com/serotonin/mango/rt/publish/httpSender/HttpSenderRT.java
@@ -18,7 +18,7 @@
  */
 package com.serotonin.mango.rt.publish.httpSender;
 
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.util.*;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -26,8 +26,7 @@
 import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.*;
 
 import com.serotonin.ShouldNeverHappenException;
 import com.serotonin.db.KeyValuePair;
@@ -47,8 +46,7 @@
 import com.serotonin.util.StringUtils;
 import com.serotonin.web.http.HttpUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import static com.serotonin.mango.Common.createGetMethod;
 import static com.serotonin.mango.Common.createPostMethod;
@@ -129,15 +127,14 @@ protected void runImpl() {
         @SuppressWarnings("synthetic-access")
         private boolean send(List<PublishQueueEntry<HttpPointVO>> list) {
             // Prepare the message
-            NameValuePair[] params = createNVPs(vo.getStaticParameters(), list, vo.isUseJSON());
+            NameValuePair[] params = createNVPs(vo.getStaticParameters(), list);
 
             HttpMethodBase method;
             if (vo.isUsePost()) {
                 PostMethod post = createPostMethod(vo.getUrl());
-                post.addParameters(params);
                 if (vo.isUseJSON()) {
                     try {
-                        post.setRequestEntity(getJSONRequestEntity(list));
+                        post.setRequestEntity(createRequestEntity(params));
                     } catch (Exception e) {
                         Common.ctx.getEventManager().raiseEvent(sendExceptionEventType, System.currentTimeMillis(), true,
                                 AlarmLevels.URGENT, new LocalizableMessage("common.default", e.getMessage()), createEventContext());
@@ -208,16 +205,12 @@ private boolean send(List<PublishQueueEntry<HttpPointVO>> list) {
         }
     }
 
-    NameValuePair[] createNVPs(List<KeyValuePair> staticParameters, List<PublishQueueEntry<HttpPointVO>> list, boolean useJSON) {
+    NameValuePair[] createNVPs(List<KeyValuePair> staticParameters, List<PublishQueueEntry<HttpPointVO>> list) {
         List<NameValuePair> nvps = new ArrayList<NameValuePair>();
 
         for (KeyValuePair kvp : staticParameters)
             nvps.add(new NameValuePair(kvp.getKey(), kvp.getValue()));
 
-        // Early return if using JSON
-        if (useJSON)
-            return nvps.toArray(new NameValuePair[nvps.size()]);
-
         for (PublishQueueEntry<HttpPointVO> e : list) {
             HttpPointVO pvo = e.getVo();
             PointValueTime pvt = e.getPvt();
@@ -247,48 +240,9 @@ NameValuePair[] createNVPs(List<KeyValuePair> staticParameters, List<PublishQueu
         return nvps.toArray(new NameValuePair[nvps.size()]);
     }
 
-    private Object getJSONPointValue(PointValueTime pvt) {
-        switch (pvt.getValue().getDataType()) {
-            case DataTypes.ALPHANUMERIC:
-                return pvt.getValue().getStringValue();
-            case DataTypes.BINARY:
-                return pvt.getValue().getBooleanValue();
-            case DataTypes.NUMERIC:
-                return pvt.getValue().getDoubleValue();
-            default:
-                throw new ShouldNeverHappenException("Unknown point value time type: " + pvt.getValue().getDataType());
-        }
-    }
-
-    private RequestEntity getJSONRequestEntity(List<PublishQueueEntry<HttpPointVO>> list) throws JsonProcessingException, UnsupportedEncodingException {
-        Map<String,Object> jsonObject = new HashMap<>();
-        for (PublishQueueEntry<HttpPointVO> point : list) {
-            HttpPointVO pvo = point.getVo();
-            PointValueTime pvt = point.getPvt();
-
-            if (pvo.isIncludeTimestamp()) {
-                Map<String,Object> pointJsonObject = new HashMap<>();
-                pointJsonObject.put("value", getJSONPointValue(pvt));
-                switch (vo.getDateFormat()) {
-                    case HttpSenderVO.DATE_FORMAT_BASIC:
-                        pointJsonObject.put("timestamp",HttpDataSourceServlet.BASIC_SDF_CACHE.getObject().format(new Date(pvt.getTime())));
-                        break;
-                    case HttpSenderVO.DATE_FORMAT_TZ:
-                        pointJsonObject.put("timestamp",HttpDataSourceServlet.TZ_SDF_CACHE.getObject().format(new Date(pvt.getTime())));
-                        break;
-                    case HttpSenderVO.DATE_FORMAT_UTC:
-                        pointJsonObject.put("timestamp",Long.toString(pvt.getTime()));
-                        break;
-                    default:
-                        throw new ShouldNeverHappenException("Unknown date format type: " + vo.getDateFormat());
-                }
-                jsonObject.put(pvo.getParameterName(), pointJsonObject);
-            } else {
-                jsonObject.put(pvo.getParameterName(), getJSONPointValue(pvt));
-            }
-        }
-        ObjectMapper jsonMapper = new ObjectMapper();
-        String jsonReq = jsonMapper.writeValueAsString(jsonObject);
+    private RequestEntity createRequestEntity(NameValuePair... result) throws JsonProcessingException, UnsupportedEncodingException {
+        ObjectMapper jsonMapper = ApplicationBeans.getObjectMapper();
+        String jsonReq = jsonMapper.writeValueAsString(result);
         return new StringRequestEntity(jsonReq, "application/json", "utf-8");
     }
 }
diff --git a/src/com/serotonin/mango/util/LoggingUtils.java b/src/com/serotonin/mango/util/LoggingUtils.java
index fade8dfc1b..9d2052ea0d 100644
--- a/src/com/serotonin/mango/util/LoggingUtils.java
+++ b/src/com/serotonin/mango/util/LoggingUtils.java
@@ -1,7 +1,9 @@
 package com.serotonin.mango.util;
 
 import br.org.scadabr.vo.scripting.ScriptVO;
+import com.serotonin.db.IntValuePair;
 import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.dataImage.DataPointRT;
 import com.serotonin.mango.rt.dataImage.PointValueTime;
 import com.serotonin.mango.rt.dataImage.SetPointSource;
 import com.serotonin.mango.rt.dataSource.DataSourceRT;
@@ -68,7 +70,7 @@ public static String scriptInfo(ScriptVO<?> script) {
         return MessageFormat.format(info, script.getName(), String.valueOf(script.getId()), script.getXid());
     }
 
-    public static String exceptionInfo(Exception ex) {
+    public static String exceptionInfo(Throwable ex) {
         if(ex == null)
             return "";
         String info = "exception: {0} (msg: {1})";
@@ -135,12 +137,12 @@ public static String dataSourcePointValueTimeInfo(DataSourceVO<?> dataSource, Da
         return LoggingUtils.dataSourceInfo(dataSource) + ", " + LoggingUtils.dataPointInfo(dataPoint) + ", " + LoggingUtils.pointValueTimeInfo(valueTime, source);
     }
 
-    public static String causeInfo(Exception e) {
+    public static String causeInfo(Throwable e) {
         return exceptionInfo(getCause(e));
     }
 
-    public static Exception getCause(Exception e) {
-        return e.getCause() != null ? (Exception) e.getCause() : e;
+    public static Throwable getCause(Throwable e) {
+        return e.getCause() != null ? e.getCause() : e;
     }
 
     public static String userInfo(User user) {
@@ -211,6 +213,30 @@ public static String entryInfo(PointValueService.BatchWriteBehindEntry entry) {
         return MessageFormat.format(info, entry.getPointId(), entry.getDataType(), entry.getTime(), entry.getDvalue());
     }
 
+    public static String info(Throwable e, DataSourceRT dataSourceRT) {
+        return exceptionInfo(e) + " - " + dataSourceInfo(dataSourceRT);
+    }
+
+    public static String info(Throwable e, DataSourceRT dataSourceRT, DataPointRT dataPointRT) {
+        return exceptionInfo(e) + " - " + dataSourceInfo(dataSourceRT) + " - " + dataPointInfo(dataPointRT);
+    }
+
+    public static String dataPointInfo(DataPointRT dataPointRT) {
+        if(dataPointRT == null)
+            return "";
+        DataPointVO dataPointVO = dataPointRT.getVO();
+        if(dataPointVO == null)
+            return dataPointRtInfo(dataPointRT);
+        return dataPointInfo(dataPointVO);
+    }
+
+    public static String dataPointRtInfo(DataPointRT dataPoint) {
+        if(dataPoint == null)
+            return "";
+        String info = "datapointrt: {0} (id: {0}, xid: {1}, dataSourceId: {2})";
+        return MessageFormat.format(info, String.valueOf(dataPoint.getId()), dataPoint.getDataSourceId());
+    }
+  
     public static String publisherInfo(PublisherVO<?> publisher) {
         if(publisher == null)
             return "";
@@ -218,6 +244,13 @@ public static String publisherInfo(PublisherVO<?> publisher) {
         return MessageFormat.format(info, publisher.getName(), publisher.getId(), publisher.getXid(), publisher.getType());
     }
 
+    public static String varInfo(IntValuePair pair) {
+        if(pair == null)
+            return "";
+        String info =  "{0} (key: {1})";
+        return MessageFormat.format(info, pair.getValue(), pair.getKey());
+    }
+
     private static String msg(EventHandlerVO eventHandler) {
         return StringUtils.isEmpty(eventHandler.getAlias()) && eventHandler.getMessage() != null ? eventHandler.getMessage().getLocalizedMessage(Common.getBundle()) : eventHandler.getAlias();
     }
diff --git a/src/com/serotonin/mango/util/NotifyEventUtils.java b/src/com/serotonin/mango/util/NotifyEventUtils.java
index 41f49c02c8..027f2d2eab 100644
--- a/src/com/serotonin/mango/util/NotifyEventUtils.java
+++ b/src/com/serotonin/mango/util/NotifyEventUtils.java
@@ -3,8 +3,8 @@
 import com.serotonin.mango.rt.event.AlarmLevels;
 import com.serotonin.mango.rt.event.EventInstance;
 import com.serotonin.mango.vo.User;
-import org.scada_lts.mango.adapter.MangoUser;
 import org.scada_lts.service.IHighestAlarmLevelService;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.ws.model.WsEventMessage;
 import org.scada_lts.web.ws.services.UserEventServiceWebSocket;
 
@@ -12,9 +12,12 @@ public final class NotifyEventUtils {
 
     private NotifyEventUtils() {}
 
-    public static void resetHighestAlarmLevels(IHighestAlarmLevelService highestAlarmLevelService, MangoUser userService, UserEventServiceWebSocket userEventService) {
+    public static void notifyEventReset(IHighestAlarmLevelService highestAlarmLevelService, UserEventServiceWebSocket userEventService) {
         highestAlarmLevelService.doResetAlarmLevels(userEventService::sendAlarmLevel);
-        notifyEventReset(userService, userEventService);
+        ApplicationBeans.Lazy.getLoggedUsersBean().ifPresent(loggedUsers -> {
+            for(User user: loggedUsers.getUsers())
+                notifyEventUpdate(user, WsEventMessage.reset(), userEventService);
+        });
     }
 
     public static void notifyEventRaise(IHighestAlarmLevelService highestAlarmLevelService, EventInstance evt, User user, UserEventServiceWebSocket userEventService) {
@@ -44,12 +47,13 @@ public static void notifyEventAck(IHighestAlarmLevelService highestAlarmLevelSer
         }
     }
 
-    public static void notifyEventReset(MangoUser userService, UserEventServiceWebSocket userEventService) {
-        for(User user: userService.getActiveUsers())
-            userEventService.sendEventUpdate(user, WsEventMessage.reset());
+    public static void notifyEventCreate(EventInstance evt, User user, UserEventServiceWebSocket userEventService) {
+        if(evt.getAlarmLevel() > AlarmLevels.NONE) {
+            notifyEventUpdate(user, WsEventMessage.create(evt), userEventService);
+        }
     }
 
-    public static void notifyEventUpdate(User user, WsEventMessage message, UserEventServiceWebSocket userEventService) {
+    private static void notifyEventUpdate(User user, WsEventMessage message, UserEventServiceWebSocket userEventService) {
         userEventService.sendEventUpdate(user, message);
     }
 }
diff --git a/src/com/serotonin/mango/view/chart/StatisticsChartRenderer.java b/src/com/serotonin/mango/view/chart/StatisticsChartRenderer.java
index 67748a6966..8327a0bcab 100644
--- a/src/com/serotonin/mango/view/chart/StatisticsChartRenderer.java
+++ b/src/com/serotonin/mango/view/chart/StatisticsChartRenderer.java
@@ -85,11 +85,9 @@ public void addDataToModel(Map<String, Object> model, DataPointVO point) {
 
         // The start value is the value of the point at the start of the period for this renderer.
         PointValueTime startValue = null;
-        if (values.size() == 0 || values.get(0).getTime() > startTime) {
+        if (!values.isEmpty()) {
             // Get the value of the point at the start time
-            PointValueTime valueTime = pointValueFacade.getPointValueBefore(startTime);
-            if (valueTime != null)
-                startValue = new PointValueTime(valueTime.getValue(), startTime);
+            startValue = values.get(0);
         }
 
         if (startValue != null || values.size() > 0) {
@@ -97,13 +95,13 @@ public void addDataToModel(Map<String, Object> model, DataPointVO point) {
                 // Runtime stats
                 StartsAndRuntimeList stats = new StartsAndRuntimeList(startValue, values, startTime, startTime
                         + getDuration());
-                model.put("start", stats.getRealStart());
+                model.put("start", stats.getStart());
                 model.put("end", stats.getEnd());
                 model.put("startsAndRuntimes", stats.getData());
             }
             else if (dataTypeId == DataTypes.NUMERIC) {
                 AnalogStatistics stats = new AnalogStatistics(startValue, values, startTime, startTime + getDuration());
-                model.put("start", stats.getRealStart());
+                model.put("start", stats.getStart());
                 model.put("end", stats.getEnd());
                 model.put("minimum", stats.getMinimum());
                 model.put("minTime", stats.getMinTime());
diff --git a/src/com/serotonin/mango/view/component/deserializer/CompoundComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/CompoundComponentDeserializer.java
index 0f1f0d143c..b8e095591c 100644
--- a/src/com/serotonin/mango/view/component/deserializer/CompoundComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/CompoundComponentDeserializer.java
@@ -8,6 +8,7 @@
 import com.serotonin.mango.view.component.*;
 import com.serotonin.mango.vo.DataPointVO;
 import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.compound.*;
 
 import java.io.IOException;
@@ -17,7 +18,7 @@
 
 public class CompoundComponentDeserializer extends JsonDeserializer<CompoundComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public CompoundComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/HtmlComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/HtmlComponentDeserializer.java
index cc706cd65c..e87e186ca5 100644
--- a/src/com/serotonin/mango/view/component/deserializer/HtmlComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/HtmlComponentDeserializer.java
@@ -9,13 +9,14 @@
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.*;
 import com.serotonin.mango.view.component.HtmlComponent;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.html.*;
 
 import java.io.IOException;
 
 public class HtmlComponentDeserializer extends JsonDeserializer<HtmlBaseComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public HtmlBaseComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/ImageSetComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/ImageSetComponentDeserializer.java
index c985fa4e1f..bef5202a60 100644
--- a/src/com/serotonin/mango/view/component/deserializer/ImageSetComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/ImageSetComponentDeserializer.java
@@ -7,6 +7,7 @@
 import com.serotonin.mango.view.component.AnalogGraphicComponent;
 import com.serotonin.mango.view.component.BinaryGraphicComponent;
 import com.serotonin.mango.view.component.MultistateGraphicComponent;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.point.imageset.AnalogGraphicComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.imageset.BinaryGraphicComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.imageset.ImageSetComponentDTO;
@@ -16,7 +17,7 @@
 
 public class ImageSetComponentDeserializer extends JsonDeserializer<ImageSetComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public ImageSetComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/ImageStateListDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/ImageStateListDeserializer.java
index 679b59937a..173df11bd7 100644
--- a/src/com/serotonin/mango/view/component/deserializer/ImageStateListDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/ImageStateListDeserializer.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.serotonin.db.IntValuePair;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -15,7 +16,7 @@
 
 public class ImageStateListDeserializer extends JsonDeserializer<List<IntValuePair>> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public List<IntValuePair> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/PointComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/PointComponentDeserializer.java
index 25e9bf91d0..c1f25f8647 100644
--- a/src/com/serotonin/mango/view/component/deserializer/PointComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/PointComponentDeserializer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.*;
 import com.serotonin.mango.view.component.*;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.point.*;
 import org.scada_lts.web.mvc.api.dto.view.components.point.imageset.ImageSetComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.script.ScriptBaseComponentDTO;
@@ -14,7 +15,7 @@
 
 public class PointComponentDeserializer extends JsonDeserializer<PointComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public PointComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/ScriptBaseComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/ScriptBaseComponentDeserializer.java
index 2dac88e2cb..1e7636aa29 100644
--- a/src/com/serotonin/mango/view/component/deserializer/ScriptBaseComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/ScriptBaseComponentDeserializer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.*;
 import com.serotonin.mango.view.component.ScriptComponent;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.point.script.ButtonComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.script.ScriptBaseComponentDTO;
 import org.scada_lts.web.mvc.api.dto.view.components.point.script.ScriptComponentDTO;
@@ -14,7 +15,7 @@
 
 public class ScriptBaseComponentDeserializer extends JsonDeserializer<ScriptBaseComponentDTO> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public ScriptBaseComponentDTO deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/component/deserializer/ViewComponentDeserializer.java b/src/com/serotonin/mango/view/component/deserializer/ViewComponentDeserializer.java
index 9bced9db39..f9536d603a 100644
--- a/src/com/serotonin/mango/view/component/deserializer/ViewComponentDeserializer.java
+++ b/src/com/serotonin/mango/view/component/deserializer/ViewComponentDeserializer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.serotonin.mango.view.ImplDefinition;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.dto.view.components.GraphicalViewComponentDTO;
 
 import java.io.IOException;
@@ -18,7 +19,7 @@
 
 public class ViewComponentDeserializer extends JsonDeserializer<List<GraphicalViewComponentDTO>> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public List<GraphicalViewComponentDTO> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/com/serotonin/mango/view/stats/AnalogStatistics.java b/src/com/serotonin/mango/view/stats/AnalogStatistics.java
index 005f782265..bdb5e56595 100644
--- a/src/com/serotonin/mango/view/stats/AnalogStatistics.java
+++ b/src/com/serotonin/mango/view/stats/AnalogStatistics.java
@@ -38,6 +38,7 @@ public class AnalogStatistics implements StatisticsGenerator {
     private boolean noData = true;
     private long realStart;
     private final long end;
+    private final long start;
 
     // State values.
     private long lastTime = -1;
@@ -56,6 +57,7 @@ public AnalogStatistics(Double startValue, List<? extends IValueTime> values, lo
     }
 
     public AnalogStatistics(Double startValue, long start, long end) {
+        this.start = start;
         this.end = end;
 
         if (startValue != null) {
@@ -175,11 +177,28 @@ public String getHelp() {
         return toString();
     }
 
+    public long getStart() {
+        return start;
+    }
+
     @Override
     public String toString() {
-        return "{minimum: " + minimum + ", minTime=" + minTime + ", maximum: " + maximum + ", maxTime=" + maxTime
-                + ", average: " + average + ", sum: " + sum + ", count: " + count + ", noData: " + noData
-                + ", realStart: " + realStart + ", end: " + end + "}";
+        return "AnalogStatistics{" +
+                "minimum=" + minimum +
+                ", minTime=" + minTime +
+                ", maximum=" + maximum +
+                ", maxTime=" + maxTime +
+                ", average=" + average +
+                ", sum=" + sum +
+                ", count=" + count +
+                ", noData=" + noData +
+                ", realStart=" + realStart +
+                ", start=" + start +
+                ", end=" + end +
+                ", lastTime=" + lastTime +
+                ", realDuration=" + realDuration +
+                ", lastValue=" + lastValue +
+                '}';
     }
 
     public static void main(String[] args) {
diff --git a/src/com/serotonin/mango/view/stats/StartsAndRuntimeList.java b/src/com/serotonin/mango/view/stats/StartsAndRuntimeList.java
index bdc2acd0a7..fadad067d1 100644
--- a/src/com/serotonin/mango/view/stats/StartsAndRuntimeList.java
+++ b/src/com/serotonin/mango/view/stats/StartsAndRuntimeList.java
@@ -53,8 +53,10 @@ public StartsAndRuntimeList(MangoValue startValue, List<? extends IValueTime> va
     private long realStart = -1;
     private MangoValue lastValue;
     private StartsAndRuntime sar;
+    private final long start;
 
     public StartsAndRuntimeList(MangoValue startValue, long start, long end) {
+        this.start = start;
         this.end = end;
         if (startValue != null) {
             lastTime = start;
@@ -142,6 +144,10 @@ public String getHelp() {
         return toString();
     }
 
+    public long getStart() {
+        return start;
+    }
+
     @Override
     public String toString() {
         return "{realStart: " + realStart + ", end: " + end + ", data: " + data.toString() + "}";
diff --git a/src/com/serotonin/mango/vo/DataPointVO.java b/src/com/serotonin/mango/vo/DataPointVO.java
index 5aa6edef5f..13c922025e 100644
--- a/src/com/serotonin/mango/vo/DataPointVO.java
+++ b/src/com/serotonin/mango/vo/DataPointVO.java
@@ -659,7 +659,15 @@ public String toString() {
 
     @Override
     public void validate(DwrResponseI18n response) {
+        validate(response, id);
+    }
+
+    @Override
+    public void validateForCreate(DwrResponseI18n response) {
+        validate(response, -1);
+    }
 
+    private void validate(DwrResponseI18n response, int id) {
         DataPointService dataPointService = new DataPointService();
         validateXid(response, dataPointService::isXidUnique, xid, id);
 
@@ -709,7 +717,7 @@ public void validate(DwrResponseI18n response) {
         if (purgeValuesLimit <= 1)
             response.addContextualMessage("purgeValuesLimit", "validate.greaterThanOne");
 
-        pointLocator.validate(response);
+        pointLocator.validate(response, this.getId());
 
         // Check text renderer type
         if (textRenderer != null && !textRenderer.getDef().supports(pointLocator.getDataTypeId()))
diff --git a/src/com/serotonin/mango/vo/ScadaValidation.java b/src/com/serotonin/mango/vo/ScadaValidation.java
index a945787292..42acfd2c7d 100644
--- a/src/com/serotonin/mango/vo/ScadaValidation.java
+++ b/src/com/serotonin/mango/vo/ScadaValidation.java
@@ -4,4 +4,5 @@
 
 public interface ScadaValidation {
     void validate(DwrResponseI18n response);
+    void validateForCreate(DwrResponseI18n response);
 }
diff --git a/src/com/serotonin/mango/vo/User.java b/src/com/serotonin/mango/vo/User.java
index 9aa16e2b50..97416496f2 100644
--- a/src/com/serotonin/mango/vo/User.java
+++ b/src/com/serotonin/mango/vo/User.java
@@ -224,11 +224,13 @@ public void raiseRecursionFailureEvent() {
 	@Override
 	public void valueBound(HttpSessionBindingEvent event) {
 		ApplicationBeans.Lazy.getLoggedUsersBean().ifPresent(loggedUsers -> loggedUsers.addUser(this, event.getSession()));
+		ApplicationBeans.Lazy.getHighestAlarmLevelServiceBean().ifPresent(highestAlarmLevelService -> highestAlarmLevelService.doResetAlarmLevels((a, b) -> {}));
 	}
 
 	@Override
 	public void valueUnbound(HttpSessionBindingEvent event) {
 		ApplicationBeans.Lazy.getLoggedUsersBean().ifPresent(loggedUsers -> loggedUsers.removeUser(this, event.getSession()));
+		ApplicationBeans.Lazy.getHighestAlarmLevelServiceBean().ifPresent(highestAlarmLevelService -> highestAlarmLevelService.doResetAlarmLevels((a, b) -> {}));
 	}
 
 	// Convenience method for JSPs
diff --git a/src/com/serotonin/mango/vo/dataSource/DataSourceVO.java b/src/com/serotonin/mango/vo/dataSource/DataSourceVO.java
index 221d26b5ce..652c37ee62 100644
--- a/src/com/serotonin/mango/vo/dataSource/DataSourceVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/DataSourceVO.java
@@ -495,7 +495,15 @@ eventId, message, getAlarmLevel(eventId, defaultAlarmLevel),
 
 	@Override
 	public void validate(DwrResponseI18n response) {
+		validate(response, id);
+	}
+
+	@Override
+	public void validateForCreate(DwrResponseI18n response) {
+		validate(response, -1);
+	}
 
+	private void validate(DwrResponseI18n response, int id) {
 		DataSourceService dataSourceService = new DataSourceService();
 		validateXid(response, dataSourceService::isXidUnique, xid, id, "dataSourceXid");
 
diff --git a/src/com/serotonin/mango/vo/dataSource/PointLocatorVO.java b/src/com/serotonin/mango/vo/dataSource/PointLocatorVO.java
index 171f88f0b1..4edafc11a3 100644
--- a/src/com/serotonin/mango/vo/dataSource/PointLocatorVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/PointLocatorVO.java
@@ -61,5 +61,9 @@ public interface PointLocatorVO extends Serializable, ChangeComparableObject {
      */
     public void validate(DwrResponseI18n response);
 
+    default void validate(DwrResponseI18n response, int dataPointId) {
+        validate(response);
+    }
+
     public DataPointSaveHandler getDataPointSaveHandler();
 }
diff --git a/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPDataSourceVO.java b/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPDataSourceVO.java
index 323f697d0d..d446e13eef 100644
--- a/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPDataSourceVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPDataSourceVO.java
@@ -75,7 +75,7 @@ public ExportCodes getEventCodes() {
 
     @Override
     public LocalizableMessage getConnectionDescription() {
-        return new LocalizableMessage("dsEdit.bacnetIp.dsconn", deviceId);
+        return new LocalizableMessage("common.tp.description", Common.getPeriodDescription(updatePeriodType, updatePeriods), new LocalizableMessage("common.default", " / Device ID: " + getDeviceId() + " / " + getBroadcastAddress() + ":" + getPort()));
     }
 
     @Override
diff --git a/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPPointLocatorVO.java b/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPPointLocatorVO.java
index acfe56e585..2ade68790c 100644
--- a/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPPointLocatorVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/bacnet/BACnetIPPointLocatorVO.java
@@ -59,7 +59,8 @@ public PointLocatorRT createRuntime() {
     }
 
     public LocalizableMessage getConfigurationDescription() {
-        return new LocalizableMessage("common.default", remoteDeviceIp);
+        ObjectType objectType = new ObjectType(getObjectTypeId());
+        return new LocalizableMessage("common.default", remoteDeviceIp + " / " + objectType.toString() + " / Obj Instance number: " + getObjectInstanceNumber());
     }
 
     @JsonRemoteProperty
diff --git a/src/com/serotonin/mango/vo/dataSource/http/HttpReceiverDataSourceVO.java b/src/com/serotonin/mango/vo/dataSource/http/HttpReceiverDataSourceVO.java
index 985db8511b..bfa47fd9bb 100644
--- a/src/com/serotonin/mango/vo/dataSource/http/HttpReceiverDataSourceVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/http/HttpReceiverDataSourceVO.java
@@ -47,12 +47,18 @@ public class HttpReceiverDataSourceVO extends DataSourceVO<HttpReceiverDataSourc
 
     @Override
     protected void addEventTypes(List<EventTypeVO> ets) {
-        // no op
+        ets.add(createEventType(HttpReceiverDataSourceRT.INITIALIZATION_EXCEPTION_EVENT, new LocalizableMessage(
+                "event.ds.initialization")));
     }
 
     @Override
     public ExportCodes getEventCodes() {
-        return null;
+        return EVENT_CODES;
+    }
+
+    private static final ExportCodes EVENT_CODES = new ExportCodes();
+    static {
+        EVENT_CODES.addElement(HttpReceiverDataSourceRT.INITIALIZATION_EXCEPTION_EVENT, "INITIALIZATION_EXCEPTION");
     }
 
     @Override
diff --git a/src/com/serotonin/mango/vo/dataSource/meta/MetaDataSourceVO.java b/src/com/serotonin/mango/vo/dataSource/meta/MetaDataSourceVO.java
index 6003364ab2..0ad7483bdb 100644
--- a/src/com/serotonin/mango/vo/dataSource/meta/MetaDataSourceVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/meta/MetaDataSourceVO.java
@@ -56,6 +56,8 @@ protected void addEventTypes(List<EventTypeVO> ets) {
                 new LocalizableMessage("event.ds.scriptError")));
         ets.add(createEventType(MetaDataSourceRT.EVENT_TYPE_RESULT_TYPE_ERROR, new LocalizableMessage(
                 "event.ds.resultType")));
+        ets.add(createEventType(MetaDataSourceRT.EVENT_TYPE_RECURSIVE_ERROR, new LocalizableMessage(
+                "event.ds.recursiveError")));
     }
 
     private static final ExportCodes EVENT_CODES = new ExportCodes();
@@ -63,6 +65,7 @@ protected void addEventTypes(List<EventTypeVO> ets) {
         EVENT_CODES.addElement(MetaDataSourceRT.EVENT_TYPE_CONTEXT_POINT_DISABLED, "CONTEXT_POINT_DISABLED");
         EVENT_CODES.addElement(MetaDataSourceRT.EVENT_TYPE_SCRIPT_ERROR, "SCRIPT_ERROR");
         EVENT_CODES.addElement(MetaDataSourceRT.EVENT_TYPE_RESULT_TYPE_ERROR, "RESULT_TYPE_ERROR");
+        EVENT_CODES.addElement(MetaDataSourceRT.EVENT_TYPE_RECURSIVE_ERROR, "RECURSIVE_ERROR");
     }
 
     @Override
diff --git a/src/com/serotonin/mango/vo/dataSource/meta/MetaPointLocatorVO.java b/src/com/serotonin/mango/vo/dataSource/meta/MetaPointLocatorVO.java
index ddcbb0f948..e0288988c9 100644
--- a/src/com/serotonin/mango/vo/dataSource/meta/MetaPointLocatorVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/meta/MetaPointLocatorVO.java
@@ -21,10 +21,9 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import com.serotonin.db.IntValuePair;
 import com.serotonin.json.JsonArray;
@@ -47,11 +46,17 @@
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.dataSource.AbstractPointLocatorVO;
 import com.serotonin.mango.vo.TimePeriodType;
+import com.serotonin.mango.vo.dataSource.PointLocatorVO;
 import com.serotonin.timer.CronTimerTrigger;
 import com.serotonin.util.SerializationHelper;
 import com.serotonin.util.StringUtils;
 import com.serotonin.web.dwr.DwrResponseI18n;
 import com.serotonin.web.i18n.LocalizableMessage;
+import org.scada_lts.mango.service.DataPointService;
+
+import static org.scada_lts.utils.ValidationDwrUtils.validateVarNameScript;
+import static org.scada_lts.utils.ValidationUtils.isCyclicDependency;
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
 
 /**
  * @author Matthew Lohbihler
@@ -174,25 +179,48 @@ public void setUpdateCronPattern(String updateCronPattern) {
         this.updateCronPattern = updateCronPattern;
     }
 
+    @Override
     public void validate(DwrResponseI18n response) {
+        validate(response, Common.NEW_ID);
+    }
+
+    @Override
+    public void validate(DwrResponseI18n response, int dataPointId) {
         if (StringUtils.isEmpty(script))
             response.addContextualMessage("script", "validate.required");
 
-        List<String> varNameSpace = new ArrayList<String>();
+        DataPointService dataPointService = new DataPointService();
+        Map<Integer, DataPointVO> dataPoints = dataPointService.getDataPoints(null, true)
+                .stream()
+                .collect(Collectors.toMap(DataPointVO::getId, Function.identity()));
+
+        List<String> varNameSpace = new ArrayList<>();
         for (IntValuePair point : context) {
             String varName = point.getValue();
+            int pointId = point.getKey();
+
+            if(pointId != Common.NEW_ID && isCyclicDependency(pointId, dataPointId, dataPoints, 10)) {
+                response.addContextualMessage("context", "validate.cyclicDependency", escapeHtml(varName));
+                break;
+            }
+
+            if(pointId != Common.NEW_ID && pointId == dataPointId) {
+                response.addContextualMessage("context", "validate.invalidVariable", escapeHtml(varName));
+                break;
+            }
+
             if (StringUtils.isEmpty(varName)) {
                 response.addContextualMessage("context", "validate.allVarNames");
                 break;
             }
 
-            if (!validateVarName(varName)) {
-                response.addContextualMessage("context", "validate.invalidVarName", varName);
+            if (!validateVarNameScript(varName)) {
+                response.addContextualMessage("context", "validate.invalidVarName", escapeHtml(varName));
                 break;
             }
 
             if (varNameSpace.contains(varName)) {
-                response.addContextualMessage("context", "validate.duplicateVarName", varName);
+                response.addContextualMessage("context", "validate.duplicateVarName", escapeHtml(varName));
                 break;
             }
 
@@ -221,18 +249,6 @@ else if (updateEvent != UPDATE_EVENT_CONTEXT_UPDATE && updateEvent != UPDATE_EVE
             response.addContextualMessage("executionDelaySeconds", "validate.invalidValue");
     }
 
-    private boolean validateVarName(String varName) {
-        char ch = varName.charAt(0);
-        if (!Character.isLetter(ch) && ch != '_')
-            return false;
-        for (int i = 1; i < varName.length(); i++) {
-            ch = varName.charAt(i);
-            if (!Character.isLetterOrDigit(ch) && ch != '_')
-                return false;
-        }
-        return true;
-    }
-
     @Override
     public void addProperties(List<LocalizableMessage> list) {
         AuditEventType.addDataTypeMessage(list, "dsEdit.pointDataType", dataTypeId);
diff --git a/src/com/serotonin/mango/vo/dataSource/modbus/ModbusDataSourceVO.java b/src/com/serotonin/mango/vo/dataSource/modbus/ModbusDataSourceVO.java
index 6f7092c2b0..5189a3338a 100644
--- a/src/com/serotonin/mango/vo/dataSource/modbus/ModbusDataSourceVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/modbus/ModbusDataSourceVO.java
@@ -52,6 +52,10 @@ protected void addEventTypes(List<EventTypeVO> ets) {
 				new LocalizableMessage("event.ds.pointRead")));
 		ets.add(createEventType(ModbusDataSource.POINT_WRITE_EXCEPTION_EVENT,
 				new LocalizableMessage("event.ds.pointWrite")));
+		ets.add(createEventType(ModbusDataSource.MONITOR_WRITE_EXCEPTION_EVENT,
+				new LocalizableMessage("event.ds.monitorWrite")));
+		ets.add(createEventType(ModbusDataSource.INITIALIZATION_EXCEPTION_EVENT,
+				new LocalizableMessage("event.ds.initialization")));
 	}
 
 	private static final ExportCodes EVENT_CODES = new ExportCodes();
@@ -62,6 +66,10 @@ protected void addEventTypes(List<EventTypeVO> ets) {
 				"POINT_READ_EXCEPTION");
 		EVENT_CODES.addElement(ModbusDataSource.POINT_WRITE_EXCEPTION_EVENT,
 				"POINT_WRITE_EXCEPTION");
+		EVENT_CODES.addElement(ModbusDataSource.MONITOR_WRITE_EXCEPTION_EVENT,
+				"MONITOR_WRITE_EXCEPTION");
+		EVENT_CODES.addElement(ModbusDataSource.INITIALIZATION_EXCEPTION_EVENT,
+				"INITIALIZATION_EXCEPTION");
 	}
 
 	@Override
diff --git a/src/com/serotonin/mango/vo/dataSource/modbus/ModbusPointLocatorVO.java b/src/com/serotonin/mango/vo/dataSource/modbus/ModbusPointLocatorVO.java
index 7577a77c0c..8f176f26e0 100644
--- a/src/com/serotonin/mango/vo/dataSource/modbus/ModbusPointLocatorVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/modbus/ModbusPointLocatorVO.java
@@ -291,8 +291,8 @@ public void validate(DwrResponseI18n response) {
 		if (!MODBUS_DATA_TYPE_CODES.isValidId(modbusDataType))
 			response.addContextualMessage("modbusDataType",
 					"validate.invalidValue");
-		if (!StringUtils.isBetweenInc(slaveId, 1, 255) && !socketMonitor)
-			response.addContextualMessage("slaveId", "validate.1to255");
+		if (!StringUtils.isBetweenInc(slaveId, 0, 255) && !socketMonitor)
+			response.addContextualMessage("slaveId", "validate.0to255");
 
 		if (!slaveMonitor && !socketMonitor) {
 			int maxEndOffset = 65536 - DataType
diff --git a/src/com/serotonin/mango/vo/dataSource/pachube/PachubeDataSourceVO.java b/src/com/serotonin/mango/vo/dataSource/pachube/PachubeDataSourceVO.java
index 3761b1f421..c8a7eb34ef 100644
--- a/src/com/serotonin/mango/vo/dataSource/pachube/PachubeDataSourceVO.java
+++ b/src/com/serotonin/mango/vo/dataSource/pachube/PachubeDataSourceVO.java
@@ -54,6 +54,9 @@ protected void addEventTypes(List<EventTypeVO> ets) {
                         "event.ds.dataParse")));
         ets.add(createEventType(PachubeDataSourceRT.POINT_WRITE_EXCEPTION_EVENT, new LocalizableMessage(
                 "event.ds.pointWrite")));
+        ets.add(createEventType(PachubeDataSourceRT.INITIALIZATION_EXCEPTION_EVENT, new LocalizableMessage(
+                "event.ds.initialization"
+        )));
     }
 
     private static final ExportCodes EVENT_CODES = new ExportCodes();
@@ -61,6 +64,7 @@ protected void addEventTypes(List<EventTypeVO> ets) {
         EVENT_CODES.addElement(PachubeDataSourceRT.DATA_RETRIEVAL_FAILURE_EVENT, "DATA_RETRIEVAL_FAILURE");
         EVENT_CODES.addElement(PachubeDataSourceRT.PARSE_EXCEPTION_EVENT, "PARSE_EXCEPTION");
         EVENT_CODES.addElement(PachubeDataSourceRT.POINT_WRITE_EXCEPTION_EVENT, "POINT_WRITE_EXCEPTION");
+        EVENT_CODES.addElement(PachubeDataSourceRT.INITIALIZATION_EXCEPTION_EVENT, "INITIALIZATION_EXCEPTION");
     }
 
     @Override
diff --git a/src/com/serotonin/mango/vo/event/EventTypeVO.java b/src/com/serotonin/mango/vo/event/EventTypeVO.java
index b2db0e3410..e21cc5c95d 100644
--- a/src/com/serotonin/mango/vo/event/EventTypeVO.java
+++ b/src/com/serotonin/mango/vo/event/EventTypeVO.java
@@ -29,6 +29,7 @@
 import com.serotonin.mango.rt.event.type.PublisherEventType;
 import com.serotonin.mango.rt.event.type.ScheduledEventType;
 import com.serotonin.mango.rt.event.type.SystemEventType;
+import com.serotonin.mango.rt.event.type.DataSourcePointEventType;
 import com.serotonin.web.i18n.LocalizableMessage;
 
 public class EventTypeVO {
@@ -45,6 +46,11 @@ public class EventTypeVO {
      * event, undefined
      */
     private int typeRef2;
+
+    /**
+     * For data source and data point event, undefined
+     */
+    private int typeRef3;
     private LocalizableMessage description;
     private List<EventHandlerVO> handlers;
     private int alarmLevel;
@@ -52,20 +58,25 @@ public class EventTypeVO {
     private int duplicateHandling;
 
     public EventTypeVO(int typeId, int typeRef1, int typeRef2) {
+        this(typeId, typeRef1, typeRef2, -1);
+    }
+
+    public EventTypeVO(int typeId, int typeRef1, int typeRef2, int typeRef3) {
         this.typeId = typeId;
         this.typeRef1 = typeRef1;
         this.typeRef2 = typeRef2;
+        this.typeRef3 = typeRef3;
     }
 
     public EventTypeVO(int typeId, int typeRef1, int typeRef2, LocalizableMessage description, int alarmLevel) {
-        this(typeId, typeRef1, typeRef2);
+        this(typeId, typeRef1, typeRef2, -1);
         this.description = description;
         this.alarmLevel = alarmLevel;
     }
 
     public EventTypeVO(int typeId, int typeRef1, int typeRef2, LocalizableMessage description, int alarmLevel,
             int duplicateHandling) {
-        this(typeId, typeRef1, typeRef2);
+        this(typeId, typeRef1, typeRef2, -1);
         this.description = description;
         this.alarmLevel = alarmLevel;
         this.duplicateHandling = duplicateHandling;
@@ -94,6 +105,8 @@ public EventType createEventType() {
             return new AuditEventType(typeRef1, typeRef2);
         if (typeId == EventType.EventSources.MAINTENANCE)
             return new MaintenanceEventType(typeRef1);
+        if(typeId == EventType.EventSources.DATA_SOURCE_POINT)
+            return new DataSourcePointEventType(new DataSourceEventType(typeRef1, typeRef2, alarmLevel, duplicateHandling), typeRef3);
         return null;
     }
 
@@ -121,6 +134,14 @@ public void setTypeRef2(int typeRef2) {
         this.typeRef2 = typeRef2;
     }
 
+    public int getTypeRef3() {
+        return typeRef3;
+    }
+
+    public void setTypeRef3(int typeRef3) {
+        this.typeRef3 = typeRef3;
+    }
+
     public LocalizableMessage getDescription() {
         return description;
     }
diff --git a/src/com/serotonin/mango/vo/mailingList/EmailRecipientDeserializer.java b/src/com/serotonin/mango/vo/mailingList/EmailRecipientDeserializer.java
index 1d1111ba6f..eefc61a6dc 100644
--- a/src/com/serotonin/mango/vo/mailingList/EmailRecipientDeserializer.java
+++ b/src/com/serotonin/mango/vo/mailingList/EmailRecipientDeserializer.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -16,7 +17,7 @@
 
 public class EmailRecipientDeserializer extends JsonDeserializer<List<EmailRecipient>>
 {
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
     @Override
     public List<EmailRecipient> deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException, JsonProcessingException
diff --git a/src/com/serotonin/mango/vo/permission/Permissions.java b/src/com/serotonin/mango/vo/permission/Permissions.java
index 17369ba9a0..d5ed81e4f4 100644
--- a/src/com/serotonin/mango/vo/permission/Permissions.java
+++ b/src/com/serotonin/mango/vo/permission/Permissions.java
@@ -287,6 +287,8 @@ public static boolean hasEventTypePermission(User user, EventType eventType) {
             return hasDataPointReadPermission(user, eventType.getDataSourceId(), eventType.getDataPointId());
         case EventType.EventSources.DATA_SOURCE:
             return hasDataSourcePermission(user, eventType.getDataSourceId());
+        case EventType.EventSources.DATA_SOURCE_POINT:
+            return hasDataSourcePermission(user, eventType.getDataSourceId()) || hasDataPointReadPermission(user, eventType.getDataSourceId(), eventType.getDataPointId());
         case EventType.EventSources.SYSTEM:
         case EventType.EventSources.COMPOUND:
         case EventType.EventSources.SCHEDULED:
diff --git a/src/com/serotonin/mango/vo/report/ImageChartUtils.java b/src/com/serotonin/mango/vo/report/ImageChartUtils.java
index aa584e6c7f..651c09260c 100644
--- a/src/com/serotonin/mango/vo/report/ImageChartUtils.java
+++ b/src/com/serotonin/mango/vo/report/ImageChartUtils.java
@@ -48,6 +48,7 @@
 import org.scada_lts.dao.SystemSettingsDAO;
 import com.serotonin.mango.util.mindprod.StripEntities;
 import com.serotonin.util.StringUtils;
+import org.scada_lts.mango.service.SystemSettingsService;
 
 import static org.scada_lts.serorepl.utils.StringUtils.truncate;
 
@@ -224,9 +225,16 @@ public static int calculateLinesNumber(List<String> pointStatisticsNames, int li
         return linesNumber;
     }
 
+    @Deprecated(since = "2.8.0")
     public static String calculatePointNameForReport(String extendedName) {
-        if(extendedName.length() > ReportChartCreator.getDataPointExtendedNameLengthLimit()) {
-            return truncate(extendedName, "...", ReportChartCreator.getDataPointExtendedNameLengthLimit());
+        SystemSettingsService settings = new SystemSettingsService();
+        return truncatePointNameForReport(extendedName, settings);
+    }
+
+    public static String truncatePointNameForReport(String extendedName, SystemSettingsService systemSettingsService) {
+        int dataPointExtendedNameLengthInReportsLimit = systemSettingsService.getDataPointExtendedNameLengthInReportsLimit();
+        if(extendedName.length() > dataPointExtendedNameLengthInReportsLimit) {
+            return truncate(extendedName, "...", dataPointExtendedNameLengthInReportsLimit);
         }
         return extendedName;
     }
diff --git a/src/com/serotonin/mango/vo/report/ReportChartCreator.java b/src/com/serotonin/mango/vo/report/ReportChartCreator.java
index c47cf31068..a9b192ed1c 100644
--- a/src/com/serotonin/mango/vo/report/ReportChartCreator.java
+++ b/src/com/serotonin/mango/vo/report/ReportChartCreator.java
@@ -36,8 +36,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jfree.data.time.TimeSeries;
+import org.scada_lts.mango.service.SystemSettingsService;
 import org.scada_lts.utils.ColorUtils;
 import com.serotonin.mango.util.DateUtils;
+import org.scada_lts.web.security.XssProtectUtils;
 
 import java.awt.*;
 import java.io.*;
@@ -59,7 +61,6 @@ public class ReportChartCreator {
     private static final int IMAGE_HEIGHT_PIXELS = 400;
     private static final int POINT_LABEL_HEIGHT_IN_LEGEND_PIXELS = 20;
     private static final int LINE_LENGTH_IN_LEGEND_LIMIT = 161;
-    private static final int DATA_POINT_EXTENDED_NAME_LENGTH_LIMIT = 64;
     public static final String IMAGE_CONTENT_ID = "reportChart.png";
 
     public static final int POINT_IMAGE_WIDTH_PIXELS = 440;
@@ -77,8 +78,17 @@ public class ReportChartCreator {
 
     final ResourceBundle bundle;
 
+    private final SystemSettingsService systemSettingsService;
+
+    @Deprecated(since = "2.8.0")
     public ReportChartCreator(ResourceBundle bundle) {
         this.bundle = bundle;
+        this.systemSettingsService = new SystemSettingsService();
+    }
+
+    public ReportChartCreator(ResourceBundle bundle, SystemSettingsService systemSettingsService) {
+        this.bundle = bundle;
+        this.systemSettingsService = systemSettingsService;
     }
 
 	/**
@@ -114,6 +124,7 @@ public void createContent(ReportInstance reportInstance, ReportDao reportDao, St
         model.put("instance", reportInstance);
         model.put("points", pointStatistics);
         model.put("inline", inlinePrefix == null ? "" : "cid:");
+        model.put("security", new XssProtectUtils());
 
         model.put("ALPHANUMERIC", DataTypes.ALPHANUMERIC);
         model.put("BINARY", DataTypes.BINARY);
@@ -148,7 +159,7 @@ else if (pointStat.getDiscreteTimeSeries() != null)
                 model.put("chartName", IMAGE_SERVLET + chartName);
             }
             int consolidatedChartHeight = ImageChartUtils.calculateHeightChart(pointStatistics, IMAGE_HEIGHT_PIXELS,
-                    POINT_LABEL_HEIGHT_IN_LEGEND_PIXELS, LINE_LENGTH_IN_LEGEND_LIMIT, DATA_POINT_EXTENDED_NAME_LENGTH_LIMIT);
+                    POINT_LABEL_HEIGHT_IN_LEGEND_PIXELS, LINE_LENGTH_IN_LEGEND_LIMIT, systemSettingsService.getDataPointExtendedNameLengthInReportsLimit());
             imageData = ImageChartUtils.getChartData(ptsc, true, IMAGE_WIDTH_PIXELS, consolidatedChartHeight);
         }
 
@@ -259,8 +270,10 @@ public List<PointStatistics> getPointStatistics() {
         return pointStatistics;
     }
 
+    @Deprecated(since = "2.8.0")
     public static int getDataPointExtendedNameLengthLimit(){
-        return DATA_POINT_EXTENDED_NAME_LENGTH_LIMIT;
+        SystemSettingsService settings = new SystemSettingsService();
+        return settings.getDataPointExtendedNameLengthInReportsLimit();
     }
 
     public static int getLineLengthInLegendLimit() {
diff --git a/src/com/serotonin/mango/vo/report/ReportPointInfo.java b/src/com/serotonin/mango/vo/report/ReportPointInfo.java
index d6b93fe838..0be9e9e46e 100644
--- a/src/com/serotonin/mango/vo/report/ReportPointInfo.java
+++ b/src/com/serotonin/mango/vo/report/ReportPointInfo.java
@@ -20,6 +20,8 @@
 
 import com.serotonin.mango.rt.dataImage.types.MangoValue;
 import com.serotonin.mango.view.text.TextRenderer;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 /**
  * @author Matthew Lohbihler
@@ -38,7 +40,8 @@ public String getExtendedName() {
         return deviceName + " - " + pointName;
     }
     public String getExtendedNameForReport() {
-        return ImageChartUtils.calculatePointNameForReport(getExtendedName());
+        SystemSettingsService systemSettingsService = ApplicationBeans.getBean("systemSettingsService", SystemSettingsService.class);
+        return ImageChartUtils.truncatePointNameForReport(getExtendedName(), systemSettingsService);
     }
     public int getReportPointId() {
         return reportPointId;
diff --git a/src/com/serotonin/mango/web/dwr/BaseDwr.java b/src/com/serotonin/mango/web/dwr/BaseDwr.java
index f7e7bad1d3..7a43074d2d 100644
--- a/src/com/serotonin/mango/web/dwr/BaseDwr.java
+++ b/src/com/serotonin/mango/web/dwr/BaseDwr.java
@@ -21,11 +21,6 @@
 import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
-
-import org.directwebremoting.WebContext;
-import org.directwebremoting.WebContextFactory;
 import org.joda.time.DateTime;
 import org.joda.time.IllegalFieldValueException;
 
@@ -51,12 +46,15 @@
 import com.serotonin.mango.web.taglib.Functions;
 import com.serotonin.util.ObjectUtils;
 import com.serotonin.util.StringUtils;
-import com.serotonin.web.content.ContentGenerator;
 import com.serotonin.web.i18n.I18NUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
-import org.scada_lts.dao.pointvalues.PointValueAdnnotationsDAO;
+import org.scada_lts.dao.DataPointDAO;
 import org.scada_lts.mango.adapter.MangoEvent;
 import org.scada_lts.mango.service.EventService;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.permissions.service.GetDataPointsWithAccess;
+import org.scada_lts.web.beans.ApplicationBeans;
+import org.scada_lts.web.content.SnippetContentGenerator;
 
 abstract public class BaseDwr {
     public static final String MODEL_ATTR_EVENTS = "events";
@@ -100,6 +98,10 @@ protected PointValueTime prepareBasePointState(String componentId, BasePointStat
                 model.put("pointValue", pointValue);
         }
 
+        User user = Common.getUser();
+        if(user != null)
+            model.put(Common.SESSION_USER, user);
+
         return pointValue;
     }
 
@@ -170,6 +172,8 @@ protected void setChart(DataPointVO point, BasePointState state, HttpServletRequ
 
     protected void setMessages(BasePointState state, HttpServletRequest request, String snippet,
             Map<String, Object> model) {
+        SystemSettingsService systemSettingsService = new SystemSettingsService();
+        model.put("isEventAssignEnabled", systemSettingsService.isEventAssignEnabled());
         state.setMessages(generateContent(request, snippet + ".jsp", model).trim());
     }
 
@@ -247,17 +251,7 @@ else if (typeId == UserComment.TYPE_POINT)
     }
 
     protected List<DataPointBean> getReadablePoints() {
-        User user = Common.getUser();
-
-        List<DataPointVO> points = new DataPointDao().getDataPoints(DataPointExtendedNameComparator.instance, false);
-        if (!Permissions.hasAdmin(user)) {
-            List<DataPointVO> userPoints = new ArrayList<DataPointVO>();
-            for (DataPointVO dp : points) {
-                if (Permissions.hasDataPointReadPermission(user, dp))
-                    userPoints.add(dp);
-            }
-            points = userPoints;
-        }
+        List<DataPointVO> points = getPoints();
 
         List<DataPointBean> result = new ArrayList<DataPointBean>();
         for (DataPointVO dp : points)
@@ -266,6 +260,13 @@ protected List<DataPointBean> getReadablePoints() {
         return result;
     }
 
+    protected List<DataPointVO> getPoints() {
+        User user = Common.getUser();
+        DataPointDAO dataPointDAO = ApplicationBeans.getBean("dataPointDAO", DataPointDAO.class);
+        GetDataPointsWithAccess getDataPointsWithAccess = new GetDataPointsWithAccess(dataPointDAO);
+        return getDataPointsWithAccess.getObjectsWithAccess(user);
+    }
+
     public Map<String, Object> getDateRangeDefaults(int periodType, int period) {
         Map<String, Object> result = new HashMap<String, Object>();
 
@@ -306,7 +307,7 @@ public static String generateContent(HttpServletRequest request, String snippet,
 //            System.out.println("request >>> " + request);
 //            System.out.println("snippet >>> " + snippet);
 //            System.out.println("model >>> " + model);
-            String str = ContentGenerator.generateContent(request, "/WEB-INF/snippet/" + snippet, model);
+            String str = SnippetContentGenerator.generateContent(request, "/WEB-INF/snippet/" + snippet, model);
             
 //            System.out.println("Content:\n"+str);
             
diff --git a/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java b/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java
index fe3f72d89b..71cbacb9a3 100644
--- a/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java
+++ b/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java
@@ -32,6 +32,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanServerConnection;
@@ -43,7 +44,9 @@
 import javax.management.remote.JMXServiceURL;
 import javax.script.ScriptException;
 
+import com.serotonin.bacnet4j.type.enumerated.ObjectType;
 import com.serotonin.db.KeyValuePair;
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.web.dwr.beans.*;
 import com.serotonin.modbus4j.SlaveIdLimit255ModbusMaster;
 import net.sf.mbus4j.Connection;
@@ -295,9 +298,10 @@ public List<DataPointVO> getPoints() {
         if (ds.getId() == Common.NEW_ID)
             return null;
 
-        List<DataPointVO> points = new DataPointService().getDataPoints(ds.getId(),
-                DataPointNameComparator.instance);
-        return points;
+        List<DataPointVO> points = super.getPoints();
+        return points.stream()
+                .filter(a -> a.getDataSourceId() == ds.getId())
+                .collect(Collectors.toList());
     }
 
     //
@@ -343,7 +347,7 @@ private DwrResponseI18n validatePoint(int id, String xid, String name,
         if (StringUtils.isEmpty(name))
             response.addContextualMessage("name", "dsEdit.validate.required");
 
-        locator.validate(response);
+        locator.validate(response, dp.getId());
 
         if (!response.getHasMessages()) {
             Common.ctx.getRuntimeManager().saveDataPoint(dp);
@@ -1187,8 +1191,8 @@ public DwrResponseI18n validateScript(String script,
             response.addMessage("script", e.getLocalizableMessage());
             LOG.warn(infoErrorExecutionScript(e, "validateScript: " + script));
         } catch (Exception e) {
+            response.addMessage("script", new LocalizableMessage("common.default", e.getMessage()));
             LOG.warn(infoErrorExecutionScript(e, "validateScript: " + script));
-            throw e;
         }
 
         return response;
@@ -2326,7 +2330,7 @@ private DwrResponseI18n validateMultipleDnp3Points(String[] names,
             DataPointService dataPointService = new DataPointService();
             validateXid(response, dataPointService::isXidUnique, dp.getXid(), Common.NEW_ID);
 
-            locators[i].validate(response);
+            locators[i].validate(response, dp.getId());
 
             if (!response.getHasMessages()) {
                 Common.ctx.getRuntimeManager().saveDataPoint(dp);
@@ -2989,4 +2993,8 @@ public DwrResponseI18n copyDataPoint(final int dataSourceId, final int dataPoint
 
         return response;
     }
+    public String getObjectTypeName(int objectTypeId) {
+        ObjectType objectType = new ObjectType(objectTypeId);
+        return objectType.toString();
+    }
 }
\ No newline at end of file
diff --git a/src/com/serotonin/mango/web/dwr/EmportDwr.java b/src/com/serotonin/mango/web/dwr/EmportDwr.java
index 18f2e44356..8e512b01ce 100644
--- a/src/com/serotonin/mango/web/dwr/EmportDwr.java
+++ b/src/com/serotonin/mango/web/dwr/EmportDwr.java
@@ -104,6 +104,8 @@ public String createExportData(int prettyIndent, boolean graphicalViews,
 				scripts, pointValues, maxPointValues, systemSettings,
 				usersProfiles, reports);
 	}
+
+	@Deprecated(since = "2.8.0")
 	public static String exportJSON(String xid){
 		Map<String, Object> data = new LinkedHashMap<String, Object>();
 		DataPointVO dataPoints = new DataPointDao().getDataPointByXid(xid);
@@ -119,6 +121,16 @@ public static String exportJSON(String xid){
 			throw new ShouldNeverHappenException(e);
 		}
 	}
+
+	public static Map<String, Object> exportDataPointBy(String xid) {
+		Map<String, Object> data = new LinkedHashMap<>();
+		DataPointVO dataPoints = new DataPointDao().getDataPointByXid(xid);
+		List<PointEventDetectorVO> detectors = new PointEventDetectorDAO().getPointEventDetectors(dataPoints);
+		dataPoints.setEventDetectors(detectors);
+		data.put(DATA_POINTS, dataPoints == null?"In the database there is no data point with given xid "+xid:dataPoints);
+		return data;
+	}
+
 	public static String createExportJSON(int prettyIndent,
 			boolean graphicalViews, boolean eventHandlers, boolean dataSources,
 			boolean dataPoints, boolean scheduledEvents,
diff --git a/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java b/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
index 6607677274..cd1fc8f625 100644
--- a/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
+++ b/src/com/serotonin/mango/web/dwr/EventHandlersDwr.java
@@ -325,7 +325,7 @@ private DwrResponseI18n save(int eventSourceId, int eventTypeRef1,
 		EventService eventService = new EventService();
 
 		vo.setId(handlerId);
-		vo.setXid(StringUtils.isEmpty(xid) ? eventService.generateUniqueXid() : xid);
+		vo.setXid(StringUtils.isEmpty(xid) && handlerId == Common.NEW_ID ? eventService.generateUniqueXid() : xid);
 		vo.setAlias(alias);
 		vo.setDisabled(disabled);
 
diff --git a/src/com/serotonin/mango/web/dwr/EventsDwr.java b/src/com/serotonin/mango/web/dwr/EventsDwr.java
index f3fb0269e1..91a0ad487f 100644
--- a/src/com/serotonin/mango/web/dwr/EventsDwr.java
+++ b/src/com/serotonin/mango/web/dwr/EventsDwr.java
@@ -40,6 +40,7 @@
 import com.serotonin.web.i18n.LocalizableMessage;
 import org.scada_lts.mango.adapter.MangoEvent;
 import org.scada_lts.mango.service.EventService;
+import org.scada_lts.mango.service.SystemSettingsService;
 
 public class EventsDwr extends BaseDwr {
 	private static final int PAGE_SIZE = 50;
@@ -49,6 +50,7 @@ public class EventsDwr extends BaseDwr {
 	public static final String STATUS_ACTIVE = "A";
 	public static final String STATUS_RTN = "R";
 	public static final String STATUS_NORTN = "N";
+	public static final String STATUS_ASSIGNEE = "U";
 
 	public static final int DATE_RANGE_TYPE_NONE = 1;
 	public static final int DATE_RANGE_TYPE_RELATIVE = 2;
@@ -88,6 +90,9 @@ public DwrResponseI18n searchOld(int eventId, int eventSourceType,
 		model.put("events", results);
 		model.put("showControls", false);
 
+		SystemSettingsService systemSettingsService = new SystemSettingsService();
+		model.put("isEventAssignEnabled", systemSettingsService.isEventAssignEnabled());
+
 		response.addData("content",
 				generateContent(request, "eventList.jsp", model));
 		response.addData("resultCount", new LocalizableMessage(
@@ -182,6 +187,9 @@ status, alarmLevel, getKeywords(keywordStr), dateRange.getL1(),
 		model.put("page", page);
 		model.put("pendingEvents", false);
 
+		SystemSettingsService systemSettingsService = new SystemSettingsService();
+		model.put("isEventAssignEnabled", systemSettingsService.isEventAssignEnabled());
+
 		response.addData("content",
 				generateContent(request, "eventList.jsp", model));
 		response.addData("resultCount", new LocalizableMessage(
diff --git a/src/com/serotonin/mango/web/dwr/MiscDwr.java b/src/com/serotonin/mango/web/dwr/MiscDwr.java
index 60324a88c3..93fdef1a7d 100644
--- a/src/com/serotonin/mango/web/dwr/MiscDwr.java
+++ b/src/com/serotonin/mango/web/dwr/MiscDwr.java
@@ -25,7 +25,6 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
@@ -43,9 +42,7 @@
 import org.directwebremoting.WebContextFactory;
 import org.scada_lts.dao.SystemSettingsDAO;
 import org.scada_lts.mango.adapter.MangoEvent;
-import org.scada_lts.mango.service.EventService;
-import org.scada_lts.mango.service.UserService;
-import org.scada_lts.mango.service.ViewService;
+import org.scada_lts.mango.service.*;
 
 import com.serotonin.io.StreamUtils;
 import com.serotonin.mango.Common;
@@ -89,26 +86,28 @@ public DwrResponseI18n toggleSilence(int eventId) {
 
 		User user = Common.getUser();
 		if (user != null) {
-			boolean result = new EventService()
-					.toggleSilence(eventId, user.getId());
-			resetLastAlarmLevelChange();
-			response.addData("silenced", result);
-		} else
+			EventService eventService = new EventService();
+			EventInstance event = eventService.getEvent(eventId);
+			if(event != null) {
+				boolean result = eventService.toggleSilence(event, user);
+				resetLastAlarmLevelChange();
+				response.addData("silenced", result);
+			} else {
+				response.addData("silenced", false);
+			}
+		} else {
 			response.addData("silenced", false);
-
+		}
 		return response;
 	}
 
 	
 	public DwrResponseI18n silenceAll() {
-		List<Integer> silenced = new ArrayList<Integer>();
+		List<Integer> silenced = new ArrayList<>();
 		User user = Common.getUser();
-		MangoEvent eventService = new EventService();
-		for (EventInstance evt : eventService.getPendingEvents(user.getId())) {
-			if (!evt.isSilenced()) {
-				eventService.toggleSilence(evt.getId(), user.getId());
-				silenced.add(evt.getId());
-			}
+		if (user != null) {
+			MangoEvent eventService = new EventService();
+			silenced = eventService.silenceEvents(user);
 		}
 
 		resetLastAlarmLevelChange();
@@ -124,23 +123,46 @@ public int acknowledgeEvent(int eventId) {
 		if (user != null) {
 			EventInstance evt = eventService.getEvent(eventId);
 			if(evt != null && !evt.isActive()) {
-				eventService.ackEvent(evt.getId(), System.currentTimeMillis(),
-						user.getId(), 0);
+				eventService.ackEvent(evt, System.currentTimeMillis(), user, 0);
 				resetLastAlarmLevelChange();
 			}
 		}
 		return eventId;
 	}
 
+	public boolean assignEvent(int eventId) {
+		User user = Common.getUser();
+		MangoEvent eventService = new EventService();
+		boolean result = false;
+		if (user != null) {
+			EventInstance evt = eventService.getEvent(eventId);
+			if(evt != null) {
+				result = eventService.assignEvent(evt, user);
+				resetLastAlarmLevelChange();
+			}
+		}
+		return result;
+	}
+
+	public boolean unassignEvent(int eventId) {
+		User user = Common.getUser();
+		MangoEvent eventService = new EventService();
+		boolean result = false;
+		if (user != null) {
+			EventInstance evt = eventService.getEvent(eventId);
+			if(evt != null) {
+				result = eventService.unassignEvent(evt, user);
+				resetLastAlarmLevelChange();
+			}
+		}
+		return result;
+	}
+
 	public void acknowledgeAllPendingEvents() {
 		User user = Common.getUser();
 		if (user != null) {
 			MangoEvent eventService = new EventService();
-			long now = System.currentTimeMillis();
-			for (EventInstance evt : eventService.getPendingEvents(user.getId())) {
-				if(!evt.isActive())
-					eventService.ackEvent(evt.getId(), now, user.getId(), 0);
-			}
+			eventService.ackEvents(user);
 			resetLastAlarmLevelChange();
 		}
 	}
@@ -253,6 +275,7 @@ public void setLocale(String locale) {
 
 	
 	public void setHomeUrl(String url) {
+		Permissions.ensureValidUser();
 		// Remove the scheme, domain, and context if there.
 		HttpServletRequest request = WebContextFactory.get()
 				.getHttpServletRequest();
@@ -276,6 +299,10 @@ public void setHomeUrl(String url) {
 			url = url.substring(1);
 
 		// Save the result
+		User user = Common.getUser();
+		user.setHomeUrl(url);
+		UserService userService = new UserService();
+		userService.saveHomeUrl(user.getId(), url);
 		new UserDao().saveHomeUrl(Common.getUser().getId(), url);
 	}
 
@@ -434,6 +461,9 @@ public Map<String, Object> doLongPoll(int pollSessionId) {
 				model.put("events", eventService.getPendingEvents(user.getId()));
 				model.put("pendingEvents", true);
 				model.put("noContentWhenEmpty", true);
+				SystemSettingsService service = new SystemSettingsService();
+				model.put("isEventAssignEnabled", service.isEventAssignEnabled());
+
 				String currentContent = generateContent(httpRequest,
 						"eventList.jsp", model);
 				currentContent = StringUtils.trimWhitespace(currentContent);
diff --git a/src/com/serotonin/mango/web/dwr/ReportsDwr.java b/src/com/serotonin/mango/web/dwr/ReportsDwr.java
index 73905f6098..d748f27d28 100644
--- a/src/com/serotonin/mango/web/dwr/ReportsDwr.java
+++ b/src/com/serotonin/mango/web/dwr/ReportsDwr.java
@@ -208,7 +208,7 @@ public void deleteReport(int id) {
         if (report != null) {
             GetReportsWithAccess.ensureReportOwnerPermission(Common.getUser(), report);
             ReportJob.unscheduleReportJob(report);
-            reportService.deleteReport(id);
+            reportService.deleteReport(report);
         }
     }
 
@@ -247,7 +247,7 @@ public ReportVO createReportFromWatchlist(int watchListId) {
 
         watchListService.populateWatchlistData(watchList);
         ReportVO report = new ReportVO();
-        report.setName(LocalizableMessage.getMessage(getResourceBundle(), "common.copyPrefix", watchList.getName()));
+        report.setName(watchList.getName());
         for (DataPointVO dp : watchList.getPointList()) {
             ReportPointVO rp = new ReportPointVO();
             rp.setPointId(dp.getId());
diff --git a/src/com/serotonin/mango/web/dwr/SystemSettingsDwr.java b/src/com/serotonin/mango/web/dwr/SystemSettingsDwr.java
index aeb9c95690..029b8c04b5 100644
--- a/src/com/serotonin/mango/web/dwr/SystemSettingsDwr.java
+++ b/src/com/serotonin/mango/web/dwr/SystemSettingsDwr.java
@@ -43,7 +43,6 @@
 import org.scada_lts.mango.service.SystemSettingsService;
 import org.scada_lts.utils.ColorUtils;
 import org.scada_lts.web.mvc.api.json.JsonSettingsHttp;
-import org.scada_lts.serorepl.utils.StringUtils;
 
 import java.io.File;
 import java.net.SocketTimeoutException;
@@ -158,9 +157,9 @@ public Map<String, Object> getSettings() {
 		settings.put(SystemSettingsDAO.HTTP_RESPONSE_HEADERS, systemSettingsService.getHttpResponseHeaders());
 
 		settings.put(SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN,
-				systemSettingsService.getMiscSettings().isHideShortcutDisableFullScreen());
+				systemSettingsService.getMiscSettings().isViewHideShortcutDisableFullScreenEnabled());
 		settings.put(SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE,
-				systemSettingsService.getMiscSettings().isEnableFullScreen());
+				systemSettingsService.getMiscSettings().isViewForceFullScreenEnabled());
 		settings.put(SystemSettingsDAO.EVENT_PENDING_LIMIT,
 				systemSettingsService.getMiscSettings().getEventPendingLimit());
 		settings.put(SystemSettingsDAO.EVENT_PENDING_CACHE_ENABLED,
@@ -177,6 +176,14 @@ public Map<String, Object> getSettings() {
 				systemSettingsService.getMiscSettings().getWebResourceGraphicsPath());
 		settings.put(SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH,
 				systemSettingsService.getMiscSettings().getWebResourceUploadsPath());
+		settings.put(SystemSettingsDAO.EVENT_ASSIGN_ENABLED,
+				systemSettingsService.getMiscSettings().isEventAssignEnabled());
+		settings.put(SystemSettingsDAO.TOP_DESCRIPTION,
+				systemSettingsService.getSystemInfoSettings().getTopDescription());
+		settings.put(SystemSettingsDAO.TOP_DESCRIPTION_PREFIX,
+				systemSettingsService.getSystemInfoSettings().getTopDescriptionPrefix());
+		settings.put(SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT,
+				systemSettingsService.getMiscSettings().getDataPointExtendedNameLengthInReportsLimit());
 		return settings;
 	}
 
@@ -329,65 +336,24 @@ public DwrResponseI18n saveMiscSettings(int uiPerformance, String dataPointRtVal
 											int eventPendingLimit, boolean eventPendingCacheEnabled,
 											boolean workItemsReportingEnabled, boolean workItemsReportingItemsPerSecondEnabled,
 											int workItemsReportingItemsPerSecondLimit, int threadsNameAdditionalLength,
-											String webResourceGraphicsPath, String webResourceUploadsPath) {
+											String webResourceGraphicsPath, String webResourceUploadsPath,
+											boolean eventAssignEnabled, int pointExtendedNameLengthInReportsLimit) {
 		Permissions.ensureAdmin();
-		SystemSettingsDAO systemSettingsDAO = new SystemSettingsDAO();
+		SystemSettingsService systemSettingsService = new SystemSettingsService();
         DwrResponseI18n response = new DwrResponseI18n();
-        if(uiPerformance < 0) {
-            response.addContextualMessage(SystemSettingsDAO.UI_PERFORMANCE, "validate.invalidValue");
-            return response;
-        } else {
-            systemSettingsDAO.setIntValue(SystemSettingsDAO.UI_PERFORMANCE, uiPerformance);
-        }
-		systemSettingsDAO.setValue(SystemSettingsDAO.DATAPOINT_RUNTIME_VALUE_SYNCHRONIZED,
-				String.valueOf(dataPointRtValueSynchronized));
-
-		systemSettingsDAO.setBooleanValue(SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE, viewEnableFullScreen);
-		systemSettingsDAO.setBooleanValue(SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN, viewHideShortcutDisableFullScreen);
-		if(eventPendingLimit < 0) {
-			response.addContextualMessage(SystemSettingsDAO.EVENT_PENDING_LIMIT, "validate.invalidValue");
-		} else {
-			systemSettingsDAO.setIntValue(SystemSettingsDAO.EVENT_PENDING_LIMIT, eventPendingLimit);
-		}
-		systemSettingsDAO.setBooleanValue(SystemSettingsDAO.EVENT_PENDING_CACHE_ENABLED, eventPendingCacheEnabled);
-		if(eventPendingLimit < 0) {
-			response.addContextualMessage(SystemSettingsDAO.THREADS_NAME_ADDITIONAL_LENGTH, "validate.invalidValue");
-		} else {
-			systemSettingsDAO.setIntValue(SystemSettingsDAO.THREADS_NAME_ADDITIONAL_LENGTH, threadsNameAdditionalLength);
-		}
-		systemSettingsDAO.setBooleanValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ENABLED, workItemsReportingEnabled);
-		if(workItemsReportingEnabled) {
-			systemSettingsDAO.setBooleanValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_ENABLED, workItemsReportingItemsPerSecondEnabled);
-			if(workItemsReportingItemsPerSecondEnabled) {
-				if (workItemsReportingItemsPerSecondLimit < 0) {
-					response.addContextualMessage(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT, "validate.invalidValue");
-				} else {
-					systemSettingsDAO.setIntValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT, workItemsReportingItemsPerSecondLimit);
-				}
-			} else {
-				systemSettingsDAO.setIntValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT, 0);
-			}
-		} else {
-			systemSettingsDAO.setBooleanValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_ENABLED, false);
-			systemSettingsDAO.setIntValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT, 0);
-		}
-		if (webResourceGraphicsPath != null && (StringUtils.isEmpty(webResourceGraphicsPath)
-				|| (webResourceGraphicsPath.endsWith("graphics")
-				|| webResourceGraphicsPath.endsWith("graphics" + File.separator)))) {
-			systemSettingsDAO.setValue(SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH, webResourceGraphicsPath);
-		}
-		else {
-			response.addContextualMessage(SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH, "systemsettings.webresource.graphics.path.wrong", File.separator);
-		}
-		if (webResourceUploadsPath != null && (StringUtils.isEmpty(webResourceUploadsPath)
-				|| (webResourceUploadsPath.endsWith("uploads")
-				|| webResourceUploadsPath.endsWith("uploads" + File.separator)))) {
-			systemSettingsDAO.setValue(SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH, webResourceUploadsPath);
-		}
-		else {
-			response.addContextualMessage(SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH, "systemsettings.webresource.uploads.path.wrong", File.separator);
-		}
-
+		systemSettingsService.saveUiPerformanceMisc(uiPerformance, response);
+		systemSettingsService.saveDataPointRuntimeValueSynchronizedMisc(dataPointRtValueSynchronized);
+		systemSettingsService.saveViewForceFullScreenModeMisc(viewEnableFullScreen);
+		systemSettingsService.saveViewHideShortcutDisableFullScreenMisc(viewHideShortcutDisableFullScreen);
+		systemSettingsService.saveEventPendingCacheEnabledMisc(eventPendingCacheEnabled);
+		systemSettingsService.saveEventPendingLimitMisc(eventPendingLimit, response);
+		systemSettingsService.saveThreadsNameAdditionalLengthMisc(threadsNameAdditionalLength, response);
+		systemSettingsService.saveWorkItemsReportingMisc(workItemsReportingItemsPerSecondEnabled, workItemsReportingItemsPerSecondLimit,
+				workItemsReportingEnabled, response);
+		systemSettingsService.saveResourceGraphicsPathMisc(webResourceGraphicsPath, response);
+		systemSettingsService.saveResourceUploadsPathMisc(webResourceUploadsPath, response);
+		systemSettingsService.saveDataPointExtendedNameLengthInReportsLimitMisc(pointExtendedNameLengthInReportsLimit, response);
+		systemSettingsService.saveEventAssignEnabledMisc(eventAssignEnabled);
 		return response;
 	}
 
@@ -467,7 +433,7 @@ public DwrResponseI18n saveColourSettings(String chartBackgroundColour,
 
 	
 	public void saveInfoSettings(String newVersionNotificationLevel,
-			String instanceDescription) {
+			String instanceDescription,String topDescriptionPrefix, String topDescription) {
 		Permissions.ensureAdmin();
 		SystemSettingsDAO systemSettingsDAO = new SystemSettingsDAO();
 		systemSettingsDAO.setValue(
@@ -475,6 +441,8 @@ public void saveInfoSettings(String newVersionNotificationLevel,
 				newVersionNotificationLevel);
 		systemSettingsDAO.setValue(SystemSettingsDAO.INSTANCE_DESCRIPTION,
 				instanceDescription);
+		systemSettingsDAO.setValue(SystemSettingsDAO.TOP_DESCRIPTION_PREFIX, topDescriptionPrefix);
+		systemSettingsDAO.setValue(SystemSettingsDAO.TOP_DESCRIPTION, topDescription);
 	}
 
 	
diff --git a/src/com/serotonin/mango/web/dwr/UsersDwr.java b/src/com/serotonin/mango/web/dwr/UsersDwr.java
index f670587539..f087b9ed3f 100644
--- a/src/com/serotonin/mango/web/dwr/UsersDwr.java
+++ b/src/com/serotonin/mango/web/dwr/UsersDwr.java
@@ -100,8 +100,8 @@ public Map<String, Object> getInitData() {
 		} else {
 			initData.put("user", user);
 			JsonSettingsMisc jsonSettingsMisc = new SystemSettingsService().getMiscSettings();
-			initData.put("forceFullScreenMode", jsonSettingsMisc.isEnableFullScreen());
-			initData.put("forceHideShortcutDisableFulLScreen", jsonSettingsMisc.isHideShortcutDisableFullScreen());
+			initData.put("forceFullScreenMode", jsonSettingsMisc.isViewForceFullScreenEnabled());
+			initData.put("forceHideShortcutDisableFulLScreen", jsonSettingsMisc.isViewHideShortcutDisableFullScreenEnabled());
 		}
 
 		return initData;
@@ -120,8 +120,8 @@ public DwrResponseI18n getUser(int id) {
 		DwrResponseI18n response = new DwrResponseI18n();
 		response.addData("user", user);
 		JsonSettingsMisc jsonSettingsMisc = new SystemSettingsService().getMiscSettings();
-		response.addData("forceFullScreenMode", jsonSettingsMisc.isEnableFullScreen());
-		response.addData("forceHideShortcutDisableFulLScreen", jsonSettingsMisc.isHideShortcutDisableFullScreen());
+		response.addData("forceFullScreenMode", jsonSettingsMisc.isViewForceFullScreenEnabled());
+		response.addData("forceHideShortcutDisableFulLScreen", jsonSettingsMisc.isViewHideShortcutDisableFullScreenEnabled());
 		return response;
 
 	}
@@ -178,9 +178,9 @@ public DwrResponseI18n saveUserAdmin(int id, String username,
 			user.setLang(SystemSettingsDAO.getValue(SystemSettingsDAO.LANGUAGE, "en"));
 		}
 		JsonSettingsMisc jsonSettingsMisc = new SystemSettingsService().getMiscSettings();
-		if(!jsonSettingsMisc.isEnableFullScreen())
+		if(!jsonSettingsMisc.isViewForceFullScreenEnabled())
 			user.setEnableFullScreen(enableFullScreen);
-		if(!jsonSettingsMisc.isHideShortcutDisableFullScreen())
+		if(!jsonSettingsMisc.isViewHideShortcutDisableFullScreenEnabled())
 			user.setHideShortcutDisableFullScreen(hideShortcutDisableFullScreen);
 
 
@@ -251,9 +251,9 @@ public DwrResponseI18n saveUser(int id, String firstName, String lastName,
 		updateUser.setUserProfileId(usersProfileId);
 		updateUser.setTheme(theme);
 		JsonSettingsMisc jsonSettingsMisc = new SystemSettingsService().getMiscSettings();
-		if(!jsonSettingsMisc.isEnableFullScreen())
+		if(!jsonSettingsMisc.isViewForceFullScreenEnabled())
 			updateUser.setEnableFullScreen(enableFullScreen);
-		if(!jsonSettingsMisc.isHideShortcutDisableFullScreen())
+		if(!jsonSettingsMisc.isViewHideShortcutDisableFullScreenEnabled())
 			updateUser.setHideShortcutDisableFullScreen(hideShortcutDisableFullScreen);
 
 		DwrResponseI18n response = new DwrResponseI18n();
diff --git a/src/com/serotonin/mango/web/dwr/ViewDwr.java b/src/com/serotonin/mango/web/dwr/ViewDwr.java
index f1dd722052..3d25a2256c 100644
--- a/src/com/serotonin/mango/web/dwr/ViewDwr.java
+++ b/src/com/serotonin/mango/web/dwr/ViewDwr.java
@@ -104,6 +104,7 @@
 import static com.serotonin.mango.web.dwr.util.AnonymousUserUtils.getRequest;
 import static com.serotonin.mango.web.dwr.util.AnonymousUserUtils.getResponse;
 import static com.serotonin.mango.web.dwr.util.AnonymousUserUtils.authenticateAnonymousUser;
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
 
 /**
  * This class is so not threadsafe. Do not use class fields except for the
@@ -211,9 +212,9 @@ public List<ViewComponentState> getViewPointData(User user, View view, boolean e
 						if (point != null) {
 							Map<String, Object> map = new HashMap<String, Object>();
 							if (imageChart)
-								map.put("name", point.getName());
+								map.put("name", escapeHtml(point.getName()));
 							else
-								map.put("name", getMessage(child.getDescription()));
+								map.put("name", escapeHtml(getMessage(child.getDescription())));
 							map.put("point", point);
 							map.put("pointValue", point.lastValue());
 							childData.add(map);
@@ -303,6 +304,7 @@ private ViewComponentState preparePointComponentState(PointComponent pointCompon
 		}
 
 		state.setInfo(generateContent(request, "infoContent.jsp", model));
+		state.setWarningIcon(generateContent(request, "warningIcon.jsp", model));
 		setMessages(state, request, "warningContent", model);
 
 		return state;
@@ -897,7 +899,10 @@ public DwrResponseI18n saveFlexComponent(String viewComponentId, int width, int
 	}
 
 	
-	public DwrResponseI18n saveAlarmListComponent(String viewComponentId, int minAlarmLevel, int maxListSize, int width, boolean hideIdColumn, boolean hideAlarmLevelColumn, boolean hideTimestampColumn, boolean hideInactivityColumn, boolean hideAckColumn, int viewId) {
+	public DwrResponseI18n saveAlarmListComponent(String viewComponentId, int minAlarmLevel, int maxListSize, int width,
+												  boolean hideIdColumn, boolean hideAlarmLevelColumn, boolean hideTimestampColumn,
+												  boolean hideInactivityColumn, boolean hideAckColumn, int viewId,
+												  boolean hideAssigneeColumn) {
 		DwrResponseI18n response = new DwrResponseI18n();
 		// Validate
 
@@ -916,6 +921,7 @@ public DwrResponseI18n saveAlarmListComponent(String viewComponentId, int minAla
 			c.setHideTimestampColumn(hideTimestampColumn);
 			c.setHideInactivityColumn(hideInactivityColumn);
 			c.setHideAckColumn(hideAckColumn);
+			c.setHideAssigneeColumn(hideAssigneeColumn);
 			// resetPointComponent(c);
 		}
 
diff --git a/src/com/serotonin/mango/web/dwr/XssDataPointBeanConverter.java b/src/com/serotonin/mango/web/dwr/XssDataPointBeanConverter.java
new file mode 100644
index 0000000000..19a6c90697
--- /dev/null
+++ b/src/com/serotonin/mango/web/dwr/XssDataPointBeanConverter.java
@@ -0,0 +1,20 @@
+package com.serotonin.mango.web.dwr;
+
+import com.serotonin.mango.web.dwr.beans.DataPointBean;
+import org.directwebremoting.convert.BeanConverter;
+import org.directwebremoting.extend.MarshallException;
+import org.directwebremoting.extend.OutboundContext;
+import org.directwebremoting.extend.OutboundVariable;
+
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
+
+public class XssDataPointBeanConverter extends BeanConverter {
+
+    @Override
+    public OutboundVariable convertOutbound(Object data, OutboundContext outctx) throws MarshallException {
+        DataPointBean dataPointBean = (DataPointBean)data;
+        dataPointBean.setName(escapeHtml(dataPointBean.getName()));
+        dataPointBean.setXid(escapeHtml(dataPointBean.getXid()));
+        return super.convertOutbound(dataPointBean, outctx);
+    }
+}
diff --git a/src/com/serotonin/mango/web/dwr/XssDataPointVoConverter.java b/src/com/serotonin/mango/web/dwr/XssDataPointVoConverter.java
new file mode 100644
index 0000000000..629b9e4a92
--- /dev/null
+++ b/src/com/serotonin/mango/web/dwr/XssDataPointVoConverter.java
@@ -0,0 +1,23 @@
+package com.serotonin.mango.web.dwr;
+
+import com.serotonin.mango.vo.DataPointVO;
+import org.directwebremoting.convert.BeanConverter;
+import org.directwebremoting.extend.*;
+
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
+
+public class XssDataPointVoConverter extends BeanConverter {
+
+    @Override
+    public OutboundVariable convertOutbound(Object data, OutboundContext outctx) throws MarshallException {
+        DataPointVO dataPointVo = (DataPointVO)data;
+        dataPointVo.setName(escapeHtml(dataPointVo.getName()));
+        dataPointVo.setXid(escapeHtml(dataPointVo.getXid()));
+        dataPointVo.setDataSourceXid(escapeHtml(dataPointVo.getDataSourceXid()));
+        dataPointVo.setChartColour(escapeHtml(dataPointVo.getChartColour()));
+        dataPointVo.setDataSourceName(escapeHtml(dataPointVo.getDataSourceName()));
+        dataPointVo.setDescription(escapeHtml(dataPointVo.getDescription()));
+        dataPointVo.setDeviceName(escapeHtml(dataPointVo.getDeviceName()));
+        return super.convertOutbound(dataPointVo, outctx);
+    }
+}
diff --git a/src/com/serotonin/mango/web/dwr/beans/BasePointState.java b/src/com/serotonin/mango/web/dwr/beans/BasePointState.java
index 6075e85533..62fb08a070 100644
--- a/src/com/serotonin/mango/web/dwr/beans/BasePointState.java
+++ b/src/com/serotonin/mango/web/dwr/beans/BasePointState.java
@@ -25,6 +25,7 @@ abstract public class BasePointState implements Cloneable {
     private String change;
     private String chart;
     private String messages;
+    private String warningIcon;
 
     public String getId() {
         return id;
@@ -58,6 +59,14 @@ public void setMessages(String messages) {
         this.messages = messages;
     }
 
+    public String getWarningIcon() {
+        return warningIcon;
+    }
+
+    public void setWarningIcon(String warningIcon) {
+        this.warningIcon = warningIcon;
+    }
+
     public void removeEqualValue(BasePointState that) {
         if (StringUtils.isEqual(change, that.change))
             change = null;
diff --git a/src/com/serotonin/mango/web/dwr/beans/RecipientListEntryBean.java b/src/com/serotonin/mango/web/dwr/beans/RecipientListEntryBean.java
index 47ebfe17a1..5bbec83b7d 100644
--- a/src/com/serotonin/mango/web/dwr/beans/RecipientListEntryBean.java
+++ b/src/com/serotonin/mango/web/dwr/beans/RecipientListEntryBean.java
@@ -37,6 +37,7 @@
 import com.serotonin.mango.vo.mailingList.UserEntry;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 
 @JsonRemoteEntity
 public class RecipientListEntryBean implements Serializable, JsonSerializable {
@@ -44,6 +45,7 @@ public class RecipientListEntryBean implements Serializable, JsonSerializable {
 
     private int recipientType;
     private int referenceId;
+    @XssProtect
     private String referenceAddress;
 
     private static final Log LOG = LogFactory.getLog(RecipientListEntryBean.class);
diff --git a/src/com/serotonin/mango/web/mvc/controller/ReportChartController.java b/src/com/serotonin/mango/web/mvc/controller/ReportChartController.java
index 9e99144dae..77ef5dab6c 100644
--- a/src/com/serotonin/mango/web/mvc/controller/ReportChartController.java
+++ b/src/com/serotonin/mango/web/mvc/controller/ReportChartController.java
@@ -24,6 +24,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.scada_lts.mango.service.SystemSettingsService;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.mvc.AbstractController;
@@ -51,7 +52,8 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
         User user = Common.getUser(request);
         Permissions.ensureReportInstancePermission(user, instance);
 
-        ReportChartCreator creator = new ReportChartCreator(Common.getBundle(request));
+        SystemSettingsService service = new SystemSettingsService();
+        ReportChartCreator creator = new ReportChartCreator(Common.getBundle(request), service);
         creator.createContent(instance, reportDao, null, false);
 
         Map<String, byte[]> imageData = new HashMap<String, byte[]>();
diff --git a/src/com/serotonin/mango/web/mvc/interceptor/CommonDataInterceptor.java b/src/com/serotonin/mango/web/mvc/interceptor/CommonDataInterceptor.java
index d855f4dc96..69dfe7fc9e 100644
--- a/src/com/serotonin/mango/web/mvc/interceptor/CommonDataInterceptor.java
+++ b/src/com/serotonin/mango/web/mvc/interceptor/CommonDataInterceptor.java
@@ -20,9 +20,10 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.scada_lts.config.ScadaVersion;
-import org.joda.time.DateTime;
+
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -36,12 +37,15 @@
 public class CommonDataInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+
         request.setAttribute("availableLanguages", Common.getLanguages());
         request.setAttribute("lang", Common.getBundle(request).getLocale().getLanguage());
         request.setAttribute("instanceDescriptionHeader", SystemSettingsDAO.getValue(SystemSettingsDAO.INSTANCE_DESCRIPTION));
         request.setAttribute("NEW_ID", Common.NEW_ID);
         request.setAttribute("scadaVersion", ScadaVersion.getInstance());
         request.setAttribute("toYear", DateUtils.getCurrentYearInt());
+        request.setAttribute("topDescriptionPrefix", SystemSettingsDAO.getValue(SystemSettingsDAO.TOP_DESCRIPTION_PREFIX));
+        request.setAttribute("topDescription", SystemSettingsDAO.getValue(SystemSettingsDAO.TOP_DESCRIPTION));
         return true;
     }
 
diff --git a/src/com/serotonin/mango/web/taglib/Functions.java b/src/com/serotonin/mango/web/taglib/Functions.java
index 7699d58902..57c417b361 100644
--- a/src/com/serotonin/mango/web/taglib/Functions.java
+++ b/src/com/serotonin/mango/web/taglib/Functions.java
@@ -30,6 +30,8 @@
 import com.serotonin.util.StringUtils;
 import com.serotonin.web.taglib.DateFunctions;
 
+import static org.scada_lts.web.security.XssProtectUtils.escapeHtml;
+
 public class Functions {
     public static String getHtmlText(DataPointVO point, PointValueTime pointValue) {
         if (point == null)
@@ -78,18 +80,17 @@ private static String getHtml(String colour, String text, boolean detectOverflow
         String result;
 
         if (text != null && detectOverflow && text.length() > 30) {
-            text = encodeDQuot(text);
             if (StringUtils.isEmpty(colour))
-                result = "<input type='text' readonly='readonly' class='ovrflw' value=\"" + text + "\"/>";
+                result = "<input type='text' readonly='readonly' class='ovrflw' value=\"" + escapeHtml(text) + "\"/>";
             else
-                result = "<input type='text' readonly='readonly' class='ovrflw' style='color:" + colour + ";' value=\""
-                        + text + "\"/>";
+                result = "<input type='text' readonly='readonly' class='ovrflw' style='color:" + escapeHtml(colour) + ";' value=\""
+                        + escapeHtml(text) + "\"/>";
         }
         else {
             if (StringUtils.isEmpty(colour))
-                result = text;
+                result = "<span>" + escapeHtml(text) + "</span>";
             else
-                result = "<span style='color:" + colour + ";'>" + text + "</span>";
+                result = "<span style='color:" + escapeHtml(colour) + ";'>" + escapeHtml(text) + "</span>";
         }
 
         return result;
diff --git a/src/org/scada_lts/config/ScadaConfig.java b/src/org/scada_lts/config/ScadaConfig.java
index a509ff4726..379154faa7 100644
--- a/src/org/scada_lts/config/ScadaConfig.java
+++ b/src/org/scada_lts/config/ScadaConfig.java
@@ -148,6 +148,7 @@ public class ScadaConfig {
 	private static final String FILE_NAME_PROPERTIES="env.properties";
 	private static final String FILE_NAME_CUSTOM_CSS="common.css";
 	private static final String DIR_NAME_CUSTOM_CONFIG="assets";
+    private static final String FILE_NAME_USER_STYLESHEET="user_styles.css";
 	
 	private static ScadaConfig instance = null;
 	
@@ -424,6 +425,5 @@ private static String getPathCustomConfig() {
 		return path;
 		
 	}
-
 	
 }
diff --git a/src/org/scada_lts/config/ScadaVersion.java b/src/org/scada_lts/config/ScadaVersion.java
index 47553e9956..290da55380 100644
--- a/src/org/scada_lts/config/ScadaVersion.java
+++ b/src/org/scada_lts/config/ScadaVersion.java
@@ -3,11 +3,15 @@
 import com.serotonin.mango.Common;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.dao.SystemSettingsDAO;
 
 
 import java.io.FileInputStream;
 import java.util.Properties;
 
+import static org.scada_lts.dao.SystemSettingsDAO.TOP_DESCRIPTION;
+import static org.scada_lts.dao.SystemSettingsDAO.TOP_DESCRIPTION_PREFIX;
+
 /**
  * Scada Version class
  *
diff --git a/src/org/scada_lts/dao/HighestAlarmLevelDAO.java b/src/org/scada_lts/dao/HighestAlarmLevelDAO.java
index e06b7b56d1..f88434f51a 100644
--- a/src/org/scada_lts/dao/HighestAlarmLevelDAO.java
+++ b/src/org/scada_lts/dao/HighestAlarmLevelDAO.java
@@ -23,6 +23,7 @@ public class HighestAlarmLevelDAO implements IHighestAlarmLevelDAO {
             + "join events e on u.eventId=e.id "
             + "where "
             + "(e.ackTs is null or e.ackTs = 0) "
+            + "and (e.assigneeTs is null or e.assigneeTs = 0) "
             + "and u.silenced='N' and " + COLUMN_NAME_USERID + "=? "
             + "and (e.rtnCause is null or e.rtnCause = 0) "
             + "and e.rtnApplicable = 'Y'";
@@ -37,6 +38,7 @@ public class HighestAlarmLevelDAO implements IHighestAlarmLevelDAO {
             + "join events e on u.eventId=e.id "
             + "where "
             + "(e.ackTs is null or e.ackTs = 0) "
+            + "and (e.assigneeTs is null or e.assigneeTs = 0) "
             + "and u.silenced='N' "
             + "and (e.rtnCause is null or e.rtnCause = 0) "
             + "and e.rtnApplicable = 'Y' "
diff --git a/src/org/scada_lts/dao/PendingEventsDAO.java b/src/org/scada_lts/dao/PendingEventsDAO.java
index 14f19b659c..b77b7c2d7b 100644
--- a/src/org/scada_lts/dao/PendingEventsDAO.java
+++ b/src/org/scada_lts/dao/PendingEventsDAO.java
@@ -49,6 +49,7 @@ public class PendingEventsDAO {
 	private final static String  COLUMN_NAME_EVENT_TYPE_ID = "typeId";
 	private final static String  COLUMN_NAME_EVENT_TYPE_REF1 = "typeRef1";
 	private final static String  COLUMN_NAME_EVENT_TYPE_REF2 = "typeRef2";
+	private final static String  COLUMN_NAME_EVENT_TYPE_REF3 = "typeRef3";
 	private final static String  COLUMN_NAME_EVENT_ACTIVE_TS = "activeTs";
 	private final static String  COLUMN_NAME_EVENT_RTN_APPLICABLE = "rtnApplicable";
 	private final static String  COLUMN_NAME_EVENT_RTN_TS = "rtnTs";
@@ -61,6 +62,8 @@ public class PendingEventsDAO {
 	private final static String  COLUMN_NAME_EVENT_USERNAME = "username";
 	private final static String  COLUMN_NAME_EVENT_ALTERNATE_ACK_SOURCE = "alternateAckSource";
 	private final static String  COLUMN_NAME_EVENT_SILENCED = "silenced";
+	private final static String COLUMN_NAME_EVENT_ASSIGNEE_TS = "assigneeTs";
+	private final static String COLUMN_NAME_EVENT_ASSIGNEE_USERNAME = "assigneeUsername";
 
 	// @formatter:off
 	private static final String SQL_EVENTS = ""
@@ -69,6 +72,7 @@ public class PendingEventsDAO {
 				+ "e.typeId, "
 				+ "e.typeRef1, "
 				+ "e.typeRef2, "
+			    + "e.typeRef3, "
 				+ "e.activeTs, "
 				+ "e.rtnApplicable, "
 				+ "e.rtnTs, "
@@ -80,7 +84,9 @@ public class PendingEventsDAO {
 				+ "e.ackUserId, "
 				+ "u.username, "
 				+ "e.alternateAckSource, "
-				+ "ue.silenced "
+				+ "ue.silenced, "
+				+ "e.assigneeTs, "
+				+ "e.assigneeUsername "
 			+ "from "
 				+ "events e   "
 				+ "left join users u on e.ackUserId=u.id   "
@@ -116,10 +122,7 @@ public List<EventInstance> getPendingEvents(int userId, final Map<Integer, List<
 	}
 
 	private EventInstance mapToEvent(Map<Integer, List<UserComment>> comments, ResultSet rs) throws SQLException {
-		int typeId = rs.getInt(COLUMN_NAME_EVENT_TYPE_ID);
-		int typeRef1 = rs.getInt(COLUMN_NAME_EVENT_TYPE_REF1);
-		int typeRef2 = rs.getInt(COLUMN_NAME_EVENT_TYPE_REF2);
-		EventType type = EventTypeUtil.createEventType(typeId,typeRef1,typeRef2);
+		EventType type = createEventType(rs);
 		long activeTS = rs.getLong(COLUMN_NAME_EVENT_ACTIVE_TS);
 		Boolean rtnApplicable = DAO.charToBool(rs.getString(COLUMN_NAME_EVENT_RTN_APPLICABLE));
 		int alarmLevel = rs.getInt(COLUMN_NAME_EVENT_ALARM_LEVEL);
@@ -163,7 +166,21 @@ private EventInstance mapToEvent(Map<Integer, List<UserComment>> comments, Resul
 		}
 
 		event.setEventComments(comments.get(event.getId()));
+
+		long assigneeTs = rs.getLong(COLUMN_NAME_EVENT_ASSIGNEE_TS);
+		if (!rs.wasNull()) {
+			event.setAssigneeTimestamp(assigneeTs);
+			event.setAssigneeUsername(rs.getString(COLUMN_NAME_EVENT_ASSIGNEE_USERNAME));
+		}
 		
 		return event;
 	}
+
+	private static EventType createEventType(ResultSet rs) throws SQLException {
+		int typeId = rs.getInt(COLUMN_NAME_EVENT_TYPE_ID);
+		int typeRef1 = rs.getInt(COLUMN_NAME_EVENT_TYPE_REF1);
+		int typeRef2 = rs.getInt(COLUMN_NAME_EVENT_TYPE_REF2);
+		int typeRef3 = rs.getInt(COLUMN_NAME_EVENT_TYPE_REF3);
+		return EventTypeUtil.createEventType(typeId, typeRef1, typeRef2, typeRef3);
+	}
 }
diff --git a/src/org/scada_lts/dao/SystemSettingsDAO.java b/src/org/scada_lts/dao/SystemSettingsDAO.java
index 9a6ff52fdd..37a3c0df9c 100644
--- a/src/org/scada_lts/dao/SystemSettingsDAO.java
+++ b/src/org/scada_lts/dao/SystemSettingsDAO.java
@@ -20,7 +20,6 @@
 import com.serotonin.InvalidArgumentException;
 import com.serotonin.ShouldNeverHappenException;
 import com.serotonin.mango.Common;
-import com.serotonin.mango.rt.maint.work.WorkItemPriority;
 import com.serotonin.mango.vo.DataPointVO;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -164,6 +163,11 @@ public class SystemSettingsDAO {
 	public static final String THREADS_NAME_ADDITIONAL_LENGTH = "threadsNameAdditionalLength";
 	public static final String WEB_RESOURCE_GRAPHICS_PATH = "webResourceGraphicsPath";
 	public static final String WEB_RESOURCE_UPLOADS_PATH = "webResourceUploadsPath";
+	public static final String EVENT_ASSIGN_ENABLED = "eventAssignEnabled";
+	public static final String TOP_DESCRIPTION_PREFIX = "topDescriptionPrefix";
+	public static final String TOP_DESCRIPTION = "topDescription";
+	public static final String CUSTOM_CSS_CONTENT = "customCssContent";
+	public static final String DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT = "dataPointExtendedNameLengthInReportsLimit";
 
 	// @formatter:off
 	private static final String SELECT_SETTING_VALUE_WHERE = ""
@@ -413,7 +417,12 @@ public String getDatabaseSchemaVersion(String key, String defaultValue) {
 		DEFAULT_VALUES.put(THREADS_NAME_ADDITIONAL_LENGTH, SystemSettingsUtils.getThreadsNameAdditionalLength());
 		DEFAULT_VALUES.put(WEB_RESOURCE_GRAPHICS_PATH, SystemSettingsUtils.getWebResourceGraphicsPath());
 		DEFAULT_VALUES.put(WEB_RESOURCE_UPLOADS_PATH, SystemSettingsUtils.getWebResourceUploadsPath());
-	}
+		DEFAULT_VALUES.put(EVENT_ASSIGN_ENABLED, SystemSettingsUtils.isEventAssignEnabled());
+		DEFAULT_VALUES.put(TOP_DESCRIPTION, "");
+		DEFAULT_VALUES.put(TOP_DESCRIPTION_PREFIX, "");
+        DEFAULT_VALUES.put(CUSTOM_CSS_CONTENT, SystemSettingsUtils.getCustomCssContent());
+		DEFAULT_VALUES.put(DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT, SystemSettingsUtils.getDataPointExtendedNameLengthInReportsLimit());
+    }
 
 	@Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED, rollbackFor = SQLException.class)
 	public void resetDataBase() {
diff --git a/src/org/scada_lts/dao/event/EventDAO.java b/src/org/scada_lts/dao/event/EventDAO.java
index 49f34a3707..ac1441e3a3 100644
--- a/src/org/scada_lts/dao/event/EventDAO.java
+++ b/src/org/scada_lts/dao/event/EventDAO.java
@@ -29,11 +29,9 @@
 import com.serotonin.mango.vo.User;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.scada_lts.dao.DAO;
-import org.scada_lts.dao.GenericDaoCR;
-import org.scada_lts.dao.IUserCommentDAO;
-import org.scada_lts.dao.SerializationData;
+import org.scada_lts.dao.*;
 import com.serotonin.mango.rt.event.type.AuditEventUtils;
+import org.scada_lts.utils.EventTypeUtil;
 import org.scada_lts.utils.QueryUtils;
 import org.scada_lts.utils.SQLPageWithTotal;
 import org.scada_lts.web.beans.ApplicationBeans;
@@ -76,6 +74,7 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 	private static final String COLUMN_NAME_TYPE_ID = "typeId";
 	private static final String COLUMN_NAME_TYPE_REF_1 = "typeRef1";
 	private static final String COLUMN_NAME_TYPE_REF_2 = "typeRef2";
+	private static final String COLUMN_NAME_TYPE_REF_3 = "typeRef3";
 	private static final String COLUMN_NAME_ACTIVE_TS = "activeTs";
 	private static final String COLUMN_NAME_RTN_APPLICABLE = "rtnApplicable";
 	private static final String COLUMN_NAME_RTN_TS = "rtnTs";
@@ -92,6 +91,9 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 	private static final String COLUMN_NAME_USER_COMMENT_COUNT = "comments";
 	private static final String COLUMN_NAME_EVENT_ID = "eventId";
 	private static final String COLUMN_NAME_USER_ID = "userId";
+
+	private static final String COLUMN_NAME_ASSIGNEE_TS = "assigneeTs";
+	private static final String COLUMN_NAME_ASSIGNEE_USERNAME = "assigneeUsername";
 	
 	//------------- User comments
 	//TODO rewrite to another class
@@ -126,6 +128,7 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			"e." + COLUMN_NAME_TYPE_ID + ", " +
 			"e." + COLUMN_NAME_TYPE_REF_1 + ", " +
 			"e." + COLUMN_NAME_TYPE_REF_2 + ", " +
+			"e." + COLUMN_NAME_TYPE_REF_3 + ", " +
 			"e." + COLUMN_NAME_ACTIVE_TS + ", " +
 			"e." + COLUMN_NAME_RTN_APPLICABLE + ", " +
 			"e." + COLUMN_NAME_RTN_TS + ", " +
@@ -135,7 +138,8 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			"e." + COLUMN_NAME_ACT_TS + ", " +
 			"e." + COLUMN_NAME_ALTERNATE_ACK_SOURCE + ", " +
 			"dp."+ COLUMN_NAME_DATAPOINT_XID + ", " +
-			"ue."+ COLUMN_NAME_SILENCED + " ";
+			"ue."+ COLUMN_NAME_SILENCED + ", " +
+			"e."+ COLUMN_NAME_ASSIGNEE_TS +" ";
 	
 	// @formatter:off
 	private static final String BASIC_EVENT_SELECT = ""
@@ -144,6 +148,7 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 				+ "e."+COLUMN_NAME_TYPE_ID+", "
 				+ "e."+COLUMN_NAME_TYPE_REF_1+", "
 				+ "e."+COLUMN_NAME_TYPE_REF_2+","
+				+ "e."+COLUMN_NAME_TYPE_REF_3+", "
 				+ "e."+COLUMN_NAME_ACTIVE_TS+","
 				+ "e."+COLUMN_NAME_RTN_APPLICABLE+", "
 				+ "e."+COLUMN_NAME_RTN_TS+","
@@ -154,7 +159,9 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 				+ "e."+COLUMN_NAME_ACT_TS+", "
 				+ "e."+COLUMN_NAME_ACT_USER_ID+", "
 				+ "u."+COLUMN_NAME_USER_NAME+","
-				+ "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+" "
+				+ "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+", "
+				+ "e."+ COLUMN_NAME_ASSIGNEE_TS +", "
+				+ "e."+ COLUMN_NAME_ASSIGNEE_USERNAME +" "
 			+ "from "
 				+ "events e " 
 			    + "left join users u on e."+COLUMN_NAME_ACT_USER_ID+"=u.id ";
@@ -165,6 +172,7 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			+ "e."+COLUMN_NAME_TYPE_ID+", "
 			+ "e."+COLUMN_NAME_TYPE_REF_1+", "
 			+ "e."+COLUMN_NAME_TYPE_REF_2+","
+			+ "e."+COLUMN_NAME_TYPE_REF_3+","
 			+ "e."+COLUMN_NAME_ACTIVE_TS+","
 			+ "e."+COLUMN_NAME_RTN_APPLICABLE+", "
 			+ "e."+COLUMN_NAME_RTN_TS+","
@@ -174,7 +182,9 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			+ "e."+COLUMN_NAME_SHORT_MESSAGE+", "
 			+ "e."+COLUMN_NAME_ACT_TS+", "
 			+ "e."+COLUMN_NAME_ACT_USER_ID+", "
-			+ "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+" "
+			+ "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+", "
+			+ "e."+ COLUMN_NAME_ASSIGNEE_TS +", "
+			+ "e."+ COLUMN_NAME_ASSIGNEE_USERNAME +" "
 			+ "from "
 			+ "events e where "
 			+ COLUMN_NAME_ID + " "
@@ -195,7 +205,8 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			+ "insert events ("
 				+ COLUMN_NAME_TYPE_ID + "," 
 				+ COLUMN_NAME_TYPE_REF_1 + "," 
-				+ COLUMN_NAME_TYPE_REF_2 + "," 
+				+ COLUMN_NAME_TYPE_REF_2 + ","
+				+ COLUMN_NAME_TYPE_REF_3 + ","
 				+ COLUMN_NAME_ACTIVE_TS + ","
 				+ COLUMN_NAME_RTN_APPLICABLE + ","
 				+ COLUMN_NAME_RTN_TS + ","
@@ -207,15 +218,15 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 				// userId ?
 				// ack_source ?
 			+") "
-			+ "values (?,?,?,?,?,?,?,?,?,?,?)";
+			+ "values (?,?,?,?,?,?,?,?,?,?,?,?)";
 	
 	private static final String EVENT_UPDATE = ""
 			+ "update "
-				+ "events set "
-				+ COLUMN_NAME_RTN_TS+"=?,"
-				+ COLUMN_NAME_RTN_CAUSE+"=? "
+				+ "events e set "
+				+ "e."+COLUMN_NAME_RTN_TS+"=?,"
+				+ "e."+COLUMN_NAME_RTN_CAUSE+"=? "
 			+ "where "
-				+ COLUMN_NAME_ID+"=?";
+				+ "e."+COLUMN_NAME_ID+"=?";
 	
 	
 	private static final String EVENT_SELECT_BASE_ON_ID = ""+
@@ -225,38 +236,55 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 	
 	private static final String EVENT_ACT ="" +
 			"update "
-				+"events set "
-				+ COLUMN_NAME_ACT_TS+"=?, "
-				+ COLUMN_NAME_ACT_USER_ID+"=?, "
-				+ COLUMN_NAME_ALTERNATE_ACK_SOURCE+"=? "
+				+"events e set "
+				+ "e."+COLUMN_NAME_ACT_TS+"=?, "
+				+ "e."+COLUMN_NAME_ACT_USER_ID+"=?, "
+				+ "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+"=? "
 		  + "where "
-				+ COLUMN_NAME_ID+"=? and "
-				+ "("+COLUMN_NAME_ACT_TS+" is null or "+COLUMN_NAME_ACT_TS+" = 0) ";
+				+ "e."+COLUMN_NAME_ID+"=? and "
+				+ "("+"e."+COLUMN_NAME_ACT_TS+" is null or "+"e."+COLUMN_NAME_ACT_TS+" = 0) ";
+
+	private static final String EVENT_ASSIGN_EVENT ="" +
+			"update "
+			+"events e set "
+			+ "e."+COLUMN_NAME_ASSIGNEE_TS +"=?, "
+			+ "e."+COLUMN_NAME_ASSIGNEE_USERNAME +"=? "
+			+ "where "
+			+ "e."+COLUMN_NAME_ID+"=? and "
+			+ "("+ "e."+COLUMN_NAME_ASSIGNEE_TS +" is null or "+ "e."+COLUMN_NAME_ASSIGNEE_TS +" = 0) ";
+
+	private static final String EVENT_UNASSIGN_EVENT ="" +
+			"update "
+			+"events e set "
+			+ "e."+COLUMN_NAME_ASSIGNEE_TS +"=null, "
+			+ "e."+COLUMN_NAME_ASSIGNEE_USERNAME +"=null "
+			+ "where "
+			+ "e."+COLUMN_NAME_ID+"=? ";
 
 	private static final String EVENT_ACT_ALL ="" +
 			"update "
-			+" events set "
-			+ COLUMN_NAME_ACT_TS+"=?, "
-			+ COLUMN_NAME_ACT_USER_ID+"=?, "
-			+ COLUMN_NAME_ALTERNATE_ACK_SOURCE+"=? "
+			+" events e set "
+			+ "e."+COLUMN_NAME_ACT_TS+"=?, "
+			+ "e."+COLUMN_NAME_ACT_USER_ID+"=?, "
+			+ "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+"=? "
 			+ "where "
-			+ "("+COLUMN_NAME_ACT_TS+" is null or "+COLUMN_NAME_ACT_TS+" = 0) ";
+			+ "("+"e."+COLUMN_NAME_ACT_TS+" is null or "+"e."+COLUMN_NAME_ACT_TS+" = 0) ";
 
 	private static final String EVENT_SILENCE_ALL ="" +
 			"UPDATE "
-			+ "userEvents SET "
-			+ COLUMN_NAME_ALARM_SILENCED+"='Y' "
-			+ "WHERE userId=? ";
+			+ "userEvents ue SET "
+			+ "ue."+COLUMN_NAME_ALARM_SILENCED+"='Y' "
+			+ "WHERE ue." + COLUMN_NAME_USER_ID + "=? ";
 
 	private static final String EVENT_ACT_IDS ="" +
 			"update "
-			+"events set "
-			+ COLUMN_NAME_ACT_TS+"=?, "
-			+ COLUMN_NAME_ACT_USER_ID+"=?, "
-			+ COLUMN_NAME_ALTERNATE_ACK_SOURCE+"=? "
+			+"events e set "
+			+ "e."+COLUMN_NAME_ACT_TS+"=?, "
+			+ "e."+COLUMN_NAME_ACT_USER_ID+"=?, "
+			+ "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+"=? "
 			+ "where "
-			+ COLUMN_NAME_ID+" rlike ? and "
-			+ "("+COLUMN_NAME_ACT_TS+" is null or "+COLUMN_NAME_ACT_TS+" = 0) ";
+			+ "e."+COLUMN_NAME_ID+" rlike ? and "
+			+ "("+"e."+COLUMN_NAME_ACT_TS+" is null or "+"e."+COLUMN_NAME_ACT_TS+" = 0) ";
 	
 	public static final String EVENT_FILTER_ACTIVE=" "
 			+"e."+ COLUMN_NAME_RTN_APPLICABLE+"=? and (e."+ COLUMN_NAME_RTN_TS+" is null or e."+COLUMN_NAME_RTN_TS+"=0)";
@@ -267,6 +295,7 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 				+ "e."+COLUMN_NAME_TYPE_ID+", "
 				+ "e."+COLUMN_NAME_TYPE_REF_1+", "
 				+ "e."+COLUMN_NAME_TYPE_REF_2+","
+				+ "e."+COLUMN_NAME_TYPE_REF_3+","
 				+ "e."+COLUMN_NAME_ACTIVE_TS+","
 				+ "e."+COLUMN_NAME_RTN_APPLICABLE+", "
 				+ "e."+COLUMN_NAME_RTN_TS+","
@@ -278,7 +307,9 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 				+ "e."+COLUMN_NAME_ACT_USER_ID+", "
 				+ "u."+COLUMN_NAME_USER_NAME+","
 				+ "e."+COLUMN_NAME_ALTERNATE_ACK_SOURCE+", "
-				+ "ue."+COLUMN_NAME_SILENCED+" "
+				+ "ue."+COLUMN_NAME_SILENCED+", "
+				+ "e."+ COLUMN_NAME_ASSIGNEE_TS +", "
+				+ "e."+ COLUMN_NAME_ASSIGNEE_USERNAME +" "
 			+ "from "
 				+ "events e " 
 				+ "left join users u on e."+COLUMN_NAME_ACT_USER_ID+"=u.id "
@@ -328,10 +359,10 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 		    +"order by uc."+COLUMN_NAME_TIME_STAMP;
 	
 	private static final String EVENT_DELETE_BEFORE= ""
-			+"delete from events "
-			+ "where "+COLUMN_NAME_ACTIVE_TS+"<? "
-			+ "  and "+COLUMN_NAME_ACT_TS+" is not null "
-			+ "  and ("+COLUMN_NAME_RTN_APPLICABLE+"=? or ("+COLUMN_NAME_RTN_APPLICABLE+"=? and "+COLUMN_NAME_ACT_TS+" is not null))";
+			+"delete from events e "
+			+ "where "+"e."+COLUMN_NAME_ACTIVE_TS+"<? "
+			+ "  and "+"e."+COLUMN_NAME_ACT_TS+" is not null "
+			+ "  and ("+"e."+COLUMN_NAME_RTN_APPLICABLE+"=? or ("+"e."+COLUMN_NAME_RTN_APPLICABLE+"=? and "+"e."+COLUMN_NAME_ACT_TS+" is not null))";
 	
 	private static final String COUNT_EVENT=""
 			+"select "
@@ -466,6 +497,7 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			"e." + COLUMN_NAME_TYPE_ID + ", " +
 			"e." + COLUMN_NAME_TYPE_REF_1 + ", " +
 			"e." + COLUMN_NAME_TYPE_REF_2 + ", " +
+			"e." + COLUMN_NAME_TYPE_REF_3 + ", " +
 			"e." + COLUMN_NAME_ACTIVE_TS + ", " +
 			"e." + COLUMN_NAME_RTN_APPLICABLE + ", " +
 			"e." + COLUMN_NAME_RTN_TS + ", " +
@@ -474,7 +506,8 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			"e." + COLUMN_NAME_MESSAGE + ", " +
 			"e." + COLUMN_NAME_ACT_TS + ", " +
 			"u." + COLUMN_NAME_USER_NAME + ", " +
-			"e." + COLUMN_NAME_ALTERNATE_ACK_SOURCE + " " +
+			"e." + COLUMN_NAME_ALTERNATE_ACK_SOURCE+", " +
+			"e."+ COLUMN_NAME_ASSIGNEE_TS +" "+
 			"FROM events e " +
 				"LEFT JOIN users u ON u.id=e.ackUserId " +
 			"WHERE typeId=? AND typeRef1=? " +
@@ -487,6 +520,7 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			"e." + COLUMN_NAME_TYPE_ID + ", " +
 			"e." + COLUMN_NAME_TYPE_REF_1 + ", " +
 			"e." + COLUMN_NAME_TYPE_REF_2 + ", " +
+			"e." + COLUMN_NAME_TYPE_REF_3 + ", " +
 			"e." + COLUMN_NAME_ACTIVE_TS + ", " +
 			"e." + COLUMN_NAME_RTN_APPLICABLE + ", " +
 			"e." + COLUMN_NAME_RTN_TS + ", " +
@@ -495,7 +529,8 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 			"e." + COLUMN_NAME_MESSAGE + ", " +
 			"e." + COLUMN_NAME_ACT_TS + ", " +
 			"u." + COLUMN_NAME_USER_NAME + ", " +
-			"e." + COLUMN_NAME_ALTERNATE_ACK_SOURCE + " " +
+			"e." + COLUMN_NAME_ALTERNATE_ACK_SOURCE + ", " +
+			"e." + COLUMN_NAME_ASSIGNEE_TS + " " +
 			"FROM events e " +
 			"LEFT JOIN users u ON u.id=e.ackUserId " +
 			"WHERE typeId=? AND typeRef1=? " +
@@ -516,9 +551,20 @@ public class EventDAO implements GenericDaoCR<EventInstance> {
 	private static final String STATUS_ACTIVE_CONDITION_SQL = "e.rtnApplicable='Y' and (e.rtnTs is null or e.rtnTs = 0)";
 	private static final String STATUS_RTN_CONDITION_SQL = "e.rtnApplicable='Y' and (e.rtnTs is not null and e.rtnTs <> 0)";
 	private static final String STATUS_NORTN_CONDITION_SQL = "e.rtnApplicable='N'";
+	private static final String STATUS_ASSIGNEE_CONDITION_SQL = "(e."+ COLUMN_NAME_ASSIGNEE_TS+" is not null and e."+COLUMN_NAME_ASSIGNEE_TS+" <> 0)";
+
+	private static final String STATUS_NO_ACTIVE_CONDITION_SQL = "(e.rtnApplicable='N' or (e.rtnTs is not null and e.rtnTs <> 0))";
+
+	private static final String UNASSIGN_EVENT_ALL ="" +
+			"update "
+			+"events e set "
+			+ "e." + COLUMN_NAME_ASSIGNEE_TS +"=null, "
+			+ "e." + COLUMN_NAME_ASSIGNEE_USERNAME +"=null "
+			+ "where "
+			+ STATUS_ACTIVE_CONDITION_SQL;
 
 	// @formatter:on
-	
+	@Deprecated(since = "2.8.0")
 	//TODO rewrite
 	static EventType createEventType(ResultSet rs, int offset)
 			throws SQLException {
@@ -556,7 +602,7 @@ else if (typeId == EventType.EventSources.MAINTENANCE)
 	public static class EventRowMapper implements RowMapper<EventInstance> {
 		public EventInstance mapRow(ResultSet rs, int rowNum) throws SQLException {
 			
-			EventType type = createEventType(rs, 2);
+			EventType type = createEventType(rs);
 			
 			LocalizableMessage message;
 			LocalizableMessage shortMessage;
@@ -575,9 +621,9 @@ public EventInstance mapRow(ResultSet rs, int rowNum) throws SQLException {
 			}
 
 			EventInstance event = new EventInstance(
-					type, 
-					rs.getLong(COLUMN_NAME_ACTIVE_TS), 
-					DAO.charToBool(rs.getString(COLUMN_NAME_RTN_APPLICABLE)), 
+					type,
+					rs.getLong(COLUMN_NAME_ACTIVE_TS),
+					DAO.charToBool(rs.getString(COLUMN_NAME_RTN_APPLICABLE)),
 					rs.getInt(COLUMN_NAME_ALARM_LEVEL),
 					message,
 					shortMessage,
@@ -595,6 +641,12 @@ public EventInstance mapRow(ResultSet rs, int rowNum) throws SQLException {
 					event.setAcknowledgedByUsername(rs.getString(COLUMN_NAME_USER_NAME));
 				event.setAlternateAckSource(rs.getInt(COLUMN_NAME_ALTERNATE_ACK_SOURCE));
 			}
+			long assigneeTs = rs.getLong(COLUMN_NAME_ASSIGNEE_TS);
+
+			if (!rs.wasNull()) {
+				event.setAssigneeTimestamp(assigneeTs);
+				event.setAssigneeUsername(rs.getString(COLUMN_NAME_ASSIGNEE_USERNAME));
+			}
 
 			return event;
 					
@@ -629,7 +681,7 @@ public UserComment mapRow(ResultSet rs, int rowNum) throws SQLException {
 	//TODO rewrite
 	private class EventTypeRowMapper implements RowMapper<EventType> {
 		public EventType mapRow(ResultSet rs, int rowNum) throws SQLException {
-				return createEventType(rs, 1);
+            return createEventType(rs);
 		}
 	}
 	
@@ -736,12 +788,21 @@ public EventCommentDTO mapRow(ResultSet rs, int rowNum) throws SQLException {
 		}
 	}
 
+	@Deprecated(since = "2.8.0")
 	private class TotalRowMapper implements RowMapper<Integer> {
 		public Integer mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return rs.getInt("TOTAL");
 		}
 	}
 
+	private static EventType createEventType(ResultSet rs) throws SQLException {
+		int typeId = rs.getInt(COLUMN_NAME_TYPE_ID);
+		int typeRef1 = rs.getInt(COLUMN_NAME_TYPE_REF_1);
+		int typeRef2 = rs.getInt(COLUMN_NAME_TYPE_REF_2);
+		int typeRef3 = rs.getInt(COLUMN_NAME_TYPE_REF_3);
+		return EventTypeUtil.createEventType(typeId, typeRef1, typeRef2, typeRef3);
+	}
+
 	/**
 	 * Select from Database Event Rows containing specific Type and Reference
 	 * To increase performance there is provided a pagination function.
@@ -809,6 +870,8 @@ public SQLPageWithTotal<EventDTO> findEvents(
 			filterCondtions.add("e.rtnTs > 0");
 		} else if (EventsDwr.STATUS_NORTN.equals(query.getStatus())) {
 			filterCondtions.add("e.rtnApplicable='N'");
+		} else if (EventsDwr.STATUS_ASSIGNEE.equals(query.getStatus())) {
+			filterCondtions.add(STATUS_ASSIGNEE_CONDITION_SQL);
 		}
 
 		List<String> userCommentKeywordConditions = new ArrayList<String>();
@@ -883,7 +946,11 @@ public List<EventInstance> findAll() {
 
 	@Override
 	public EventInstance findById(Object[] pk) {
-		return (EventInstance) DAO.getInstance().getJdbcTemp().queryForObject(EVENT_SELECT_BASE_ON_ID, pk, new EventRowMapper());
+		try {
+			return (EventInstance) DAO.getInstance().getJdbcTemp().queryForObject(EVENT_SELECT_BASE_ON_ID, pk, new EventRowMapper());
+		} catch (EmptyResultDataAccessException e) {
+			return null;
+		}
 	}
 
 	@Override
@@ -919,6 +986,7 @@ public PreparedStatement createPreparedStatement(Connection connection) throws S
 				 						type.getEventSourceId(),
 				 						type.getReferenceId1(),
 				 						type.getReferenceId2(),
+										type.getReferenceId3(),
 				 						entity.getActiveTimestamp(),
 				 						DAO.boolToChar(entity.isRtnApplicable()),
 				 						(!entity.isActive() ? entity.getRtnTimestamp():0),
@@ -965,22 +1033,27 @@ public void updateAck(long actTS, long userId, int alternateAckSource, long even
 
 	}
 
-	public void ackAllPending(long actTS, long userId, int alternateAckSource) {
+	public void ackEvents(long actTS, long userId, int alternateAckSource) {
 
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("actTS:"+actTS+" userId:"+userId+" alternateAckSource:"+alternateAckSource);
 		}
-		DAO.getInstance().getJdbcTemp().update( EVENT_ACT_ALL, new Object[]  { actTS, userId, alternateAckSource } );
+		DAO.getInstance().getJdbcTemp().update( EVENT_ACT_ALL + "and " + STATUS_NO_ACTIVE_CONDITION_SQL, new Object[]  { actTS, userId, alternateAckSource } );
 	}
 
-	public void silenceAll(long userId) {
+	public void silenceEvents(long userId) {
 		if (LOG.isTraceEnabled()) {
 			LOG.trace(" userId:"+userId);
 		}
 		DAO.getInstance().getJdbcTemp().update( EVENT_SILENCE_ALL, new Object[]  { userId } );
 	}
 
-
+	public void unassignEvents() {
+		if (LOG.isTraceEnabled()) {
+			LOG.trace(" unassignEvents");
+		}
+		DAO.getInstance().getJdbcTemp().update(UNASSIGN_EVENT_ALL, new Object[]  {} );
+	}
 
 	public void ackAllPendingSelected(long actTS, long userId, int alternateAckSource, List<Integer> ids) {
 		if (LOG.isTraceEnabled()) {
@@ -1090,6 +1163,8 @@ public List<EventInstance> searchOld(int eventId, int eventSourceType, String st
 			where.add(STATUS_RTN_CONDITION_SQL);
 		} else if (EventsDwr.STATUS_NORTN.equals(status)) {
 			where.add(STATUS_NORTN_CONDITION_SQL);
+		} else if (EventsDwr.STATUS_ASSIGNEE.equals(status)) {
+			where.add(STATUS_ASSIGNEE_CONDITION_SQL);
 		}
 
 		if (alarmLevel != -1) {
@@ -1194,6 +1269,8 @@ public List<EventInstance> search(int eventId, int eventSourceType,
 			where.add(STATUS_RTN_CONDITION_SQL);
 		} else if (EventsDwr.STATUS_NORTN.equals(status)) {
 			where.add(STATUS_NORTN_CONDITION_SQL);
+		} else if (EventsDwr.STATUS_ASSIGNEE.equals(status)) {
+			where.add(STATUS_ASSIGNEE_CONDITION_SQL);
 		}
 
 		if (alarmLevel != -1) {
@@ -1481,4 +1558,38 @@ public String joinOr(List<String> conditions) {
 		}
 		return result.toString();
 	}
+
+	public boolean isSilence(int eventId, int userId) {
+		String result = null;
+		try {
+			result = DAO.getInstance().getJdbcTemp().queryForObject(SILENCED_SELECT, new Object[]{eventId, userId}, String.class);
+		} catch (Exception ex) {
+			LOG.warn(ex);
+		}
+		if (result == null) {
+			return true;
+		} else {
+			return DAO.charToBool(result);
+		}
+	}
+
+	public boolean assign(long eventId, long acceptTs, User user) {
+
+		if (LOG.isTraceEnabled()) {
+			LOG.trace("acceptTs:"+acceptTs+" username:"+user.getUsername()+" eventId:"+eventId);
+		}
+
+		int updates = DAO.getInstance().getJdbcTemp().update(EVENT_ASSIGN_EVENT, new Object[]  { acceptTs, user.getUsername(), eventId } );
+		return updates > 0;
+	}
+
+	public boolean unassign(long eventId) {
+
+		if (LOG.isTraceEnabled()) {
+			LOG.trace("eventId:"+eventId);
+		}
+
+		int updates = DAO.getInstance().getJdbcTemp().update(EVENT_UNASSIGN_EVENT, new Object[]  { eventId } );
+		return updates > 0;
+	}
 }
diff --git a/src/org/scada_lts/dao/migration/mysql/V2_8_0_1__AddTypeRef3ColumnToEvents.java b/src/org/scada_lts/dao/migration/mysql/V2_8_0_1__AddTypeRef3ColumnToEvents.java
new file mode 100644
index 0000000000..61b8977f9e
--- /dev/null
+++ b/src/org/scada_lts/dao/migration/mysql/V2_8_0_1__AddTypeRef3ColumnToEvents.java
@@ -0,0 +1,35 @@
+package org.scada_lts.dao.migration.mysql;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+import org.scada_lts.dao.DAO;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+public class V2_8_0_1__AddTypeRef3ColumnToEvents extends BaseJavaMigration {
+
+    private static final Log LOG = LogFactory.getLog(V2_8_0_1__AddTypeRef3ColumnToEvents.class);
+
+    @Override
+    public void migrate(Context context) throws Exception {
+
+        final JdbcTemplate jdbcTmp = DAO.getInstance().getJdbcTemp();
+
+        try {
+            migrate(jdbcTmp);
+        } catch (Exception ex) {
+            LOG.error(ex.getMessage(), ex);
+            throw ex;
+        }
+    }
+
+    private void migrate(JdbcTemplate jdbcTmp) {
+
+        boolean existsTypeRef3Column = jdbcTmp.queryForObject("SELECT (SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`= DATABASE() AND `TABLE_NAME`='events' AND `COLUMN_NAME`='typeRef3') IS NOT NULL;", boolean.class);
+
+        if(!existsTypeRef3Column)
+            jdbcTmp.update( "ALTER TABLE events ADD COLUMN typeRef3 int not null");
+    }
+}
+
diff --git a/src/org/scada_lts/dao/migration/mysql/V2_8_0__AddAssigneeColumnsToEvents.java b/src/org/scada_lts/dao/migration/mysql/V2_8_0__AddAssigneeColumnsToEvents.java
new file mode 100644
index 0000000000..74c5412114
--- /dev/null
+++ b/src/org/scada_lts/dao/migration/mysql/V2_8_0__AddAssigneeColumnsToEvents.java
@@ -0,0 +1,71 @@
+package org.scada_lts.dao.migration.mysql;
+
+import com.serotonin.mango.view.View;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+import org.scada_lts.dao.DAO;
+import org.scada_lts.dao.SerializationData;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.util.List;
+import java.util.Objects;
+
+public class V2_8_0__AddAssigneeColumnsToEvents extends BaseJavaMigration {
+
+    private static final Log LOG = LogFactory.getLog(V2_8_0__AddAssigneeColumnsToEvents.class);
+
+    @Override
+    public void migrate(Context context) throws Exception {
+
+        final JdbcTemplate jdbcTmp = DAO.getInstance().getJdbcTemp();
+
+        try {
+            addAssigneeColumn(jdbcTmp);
+            updateViewComponents(jdbcTmp);
+        } catch (Exception ex) {
+            LOG.error(ex.getMessage(), ex);
+            throw ex;
+        }
+    }
+
+    private void addAssigneeColumn(JdbcTemplate jdbcTmp) {
+
+        boolean existsAssigneeTsColumn = jdbcTmp.queryForObject("SELECT (SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`= DATABASE() AND `TABLE_NAME`='events' AND `COLUMN_NAME`='assigneeTs') IS NOT NULL;", boolean.class);
+        boolean existsAssigneeUsernameColumn = jdbcTmp.queryForObject("SELECT (SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`= DATABASE() AND `TABLE_NAME`='events' AND `COLUMN_NAME`='assigneeUsername') IS NOT NULL;", boolean.class);
+
+        if(!existsAssigneeTsColumn)
+            jdbcTmp.update("ALTER TABLE events ADD COLUMN assigneeTs bigint DEFAULT NULL;");
+
+        if(!existsAssigneeUsernameColumn)
+            jdbcTmp.update("ALTER TABLE events ADD COLUMN assigneeUsername VARCHAR(40) DEFAULT NULL;");
+    }
+
+    private void updateViewComponents(JdbcTemplate jdbcTmp) {
+        List<View> views = jdbcTmp.query("SELECT id, data FROM mangoViews", (resultSet, i) -> {
+            try (InputStream inputStream = resultSet.getBinaryStream("data");
+                 ObjectInputStream objectInputStream = new ObjectInputStream(inputStream)) {
+                View view = (View) objectInputStream.readObject();
+                view.setId(resultSet.getInt("id"));
+                return view;
+            } catch (IOException | ClassNotFoundException ex) {
+                LOG.error(ex.getMessage(), ex);
+                return null;
+            }
+        });
+
+        boolean isNull = views.stream().anyMatch(Objects::isNull);
+        if (isNull) {
+            throw new IllegalStateException("View is null!");
+        }
+
+        for (View view : views) {
+            jdbcTmp.update("UPDATE mangoViews set data = ? WHERE id = ?",
+                    new SerializationData().writeObject(view), view.getId());
+        }
+    }
+}
diff --git a/src/org/scada_lts/dao/pointvalues/PointValueDAO.java b/src/org/scada_lts/dao/pointvalues/PointValueDAO.java
index 703eb09015..e82c8fdfc6 100644
--- a/src/org/scada_lts/dao/pointvalues/PointValueDAO.java
+++ b/src/org/scada_lts/dao/pointvalues/PointValueDAO.java
@@ -194,30 +194,30 @@ public class PointValueDAO implements GenericDaoCR<PointValue>, IPointValueDAO {
 
 	public static final String POINT_VALUE_FILTER_BASE_ON_DATA_POINT_ID_AND_TIME_STAMP = " "
 			+ "pv."+COLUMN_NAME_DATA_POINT_ID+"=? and "
-			+ "pv."+COLUMN_NAME_TIME_STAMP+" >= ? order by "+COLUMN_NAME_TIME_STAMP;
+			+ "pv."+COLUMN_NAME_TIME_STAMP+" >= ? order by pv."+COLUMN_NAME_TIME_STAMP+", pv." + COLUMN_NAME_ID;
 
 	public static final String POINT_VALUE_FILTER_BASE_ON_DATA_POINT_ID_AND_TIME_STAMP_FROM_TO = " "
 			+ "pv."+COLUMN_NAME_DATA_POINT_ID+"=? and "
-			+ "pv."+COLUMN_NAME_TIME_STAMP+">=? and pv."+COLUMN_NAME_TIME_STAMP+"<? order by "+COLUMN_NAME_TIME_STAMP;
+			+ "pv."+COLUMN_NAME_TIME_STAMP+">=? and pv."+COLUMN_NAME_TIME_STAMP+"<? order by pv."+COLUMN_NAME_TIME_STAMP+", pv." + COLUMN_NAME_ID;
 
 	public static final String POINT_VALUE_FILTER_LAST_BASE_ON_DATA_POINT_ID = " "
 			+ "pv."+COLUMN_NAME_DATA_POINT_ID+"=? "
-			+ "order by pv."+COLUMN_NAME_TIME_STAMP+" desc";
+			+ "order by pv."+COLUMN_NAME_TIME_STAMP+" desc, pv." + COLUMN_NAME_ID + " desc";
 
 	public static final String POINT_VALUE_FILTER_LATEST_BASE_ON_DATA_POINT_ID = " "
 			+ "pv."+COLUMN_NAME_DATA_POINT_ID+"=? and "
 			+ "pv."+COLUMN_NAME_TIME_STAMP+"<? "
-			+ "order by pv."+COLUMN_NAME_TIME_STAMP+" desc";
+			+ "order by pv."+COLUMN_NAME_TIME_STAMP+" desc, pv." + COLUMN_NAME_ID + " desc";
 
 	public static final String POINT_VALUE_FILTER_BEFORE_TIME_STAMP_BASE_ON_DATA_POINT_ID = " "
 			+ "pv."+COLUMN_NAME_DATA_POINT_ID+"=? and "
 			+ "pv."+COLUMN_NAME_TIME_STAMP+"<? "
-			+ "order by pv."+COLUMN_NAME_TIME_STAMP;
+			+ "order by pv."+COLUMN_NAME_TIME_STAMP+", pv." + COLUMN_NAME_ID;
 
 	public static final String POINT_VALUE_FILTER_AT_TIME_STAMP_BASE_ON_DATA_POINT_ID = " "
 			+ "pv."+COLUMN_NAME_DATA_POINT_ID+"=? and "
 			+ "pv."+COLUMN_NAME_TIME_STAMP+"=? "
-			+ "order by pv."+COLUMN_NAME_TIME_STAMP;
+			+ "order by pv."+COLUMN_NAME_TIME_STAMP+", pv." + COLUMN_NAME_ID;
 
 	public static final String POINT_VALUE_ID_OF_LAST_VALUE = ""
 			+ "select"
@@ -246,7 +246,7 @@ public class PointValueDAO implements GenericDaoCR<PointValue>, IPointValueDAO {
 			+ "select id "
 			+ "from pointValues "
 			+ "where dataPointId =? "
-			+ "order by id DESC "
+			+ "order by ts DESC, id DESC "
 			+ "limit 2 "
 			+ ") lastId ) and " + COLUMN_NAME_TIME_STAMP + "<? ";
 
@@ -279,7 +279,7 @@ public class PointValueDAO implements GenericDaoCR<PointValue>, IPointValueDAO {
 			"(select " + COLUMN_NAME_ID +
 			" from pointValues " +
 			"where " + COLUMN_NAME_DATA_POINT_ID + " =? " +
-			"order by " + COLUMN_NAME_ID + " desc " +
+			"order by " + COLUMN_NAME_TIME_STAMP + " desc, " + COLUMN_NAME_ID + " desc " +
 			"limit 1 offset ?) lastId)";
 
 	private static final String SELECT_MAX_TIME_WHERE_DATA_POINT_ID = ""
diff --git a/src/org/scada_lts/ds/messaging/MessagingDataSourceRT.java b/src/org/scada_lts/ds/messaging/MessagingDataSourceRT.java
index 8904344af3..e1d87c2d47 100644
--- a/src/org/scada_lts/ds/messaging/MessagingDataSourceRT.java
+++ b/src/org/scada_lts/ds/messaging/MessagingDataSourceRT.java
@@ -21,8 +21,6 @@
 
 public class MessagingDataSourceRT extends PollingDataSource {
 
-    private static final String ATTR_UNRELIABLE_KEY = "UNRELIABLE";
-    private static final String ATTR_UPDATE_ERROR_KEY = "DP_UPDATE_ERROR";
 
     public static final int DATA_SOURCE_EXCEPTION_EVENT = 1;
     public static final int DATA_POINT_PUBLISH_EXCEPTION_EVENT = 2;
@@ -51,32 +49,33 @@ public void setPointValue(DataPointRT dataPoint, PointValueTime valueTime, SetPo
         if (!messagingService.isOpen(dataPoint)) {
             LOG.warn("Error Publish: " + dataSourcePointValueTimeInfo(vo, dataPointVO, valueTime, source));
             raiseEvent(DATA_POINT_PUBLISH_EXCEPTION_EVENT, System.currentTimeMillis(), true,
-                    getExceptionMessage(new RuntimeException("Error Publish: " + dataSourcePointValueTimeInfo(vo, dataPointVO, valueTime, source) + ", Message: Connection Closed. ")));
-            dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+                    getExceptionMessage(new RuntimeException("Error Publish: " + dataSourcePointValueTimeInfo(vo, dataPointVO, valueTime, source) + ", Message: Connection Closed. ")),
+                    dataPoint);
             return;
         }
         String message = valueTime.getStringValue();
         try {
             messagingService.publish(dataPoint, message);
-            returnToNormal(DATA_POINT_PUBLISH_EXCEPTION_EVENT, System.currentTimeMillis());
-            dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, false);
-        } catch (Exception e) {
+            returnToNormal(DATA_POINT_PUBLISH_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+        } catch (Throwable e) {
             LOG.error(dataSourcePointValueTimeInfo(vo, dataPointVO, valueTime, source) + ", "
                     + exceptionInfo(e), e);
             raiseEvent(DATA_POINT_PUBLISH_EXCEPTION_EVENT, System.currentTimeMillis(), true,
-                    new LocalizableMessage("event.ds.publishFailed", dataPointVO.getName()));
-            dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+                    new LocalizableMessage("event.ds.publishFailed", dataPointVO.getName()), dataPoint);
         }
     }
 
     @Override
     public void initialize() {
         try {
+            updateAttemptsCounters.clear();
             messagingService.open();
-        } catch (Exception e) {
-            LOG.error(exceptionInfo(e), e);
+            returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+        } catch (Throwable e) {
+            LOG.error(info(e, this), e);
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(),
-                    false, getExceptionMessage(e));
+                    true, getExceptionMessage(e));
+            return;
         }
         super.initialize();
     }
@@ -87,12 +86,13 @@ public void terminate() {
         super.terminate();
         try {
             messagingService.close();
-        } catch (Exception e) {
-            LOG.error(exceptionInfo(e), e);
+            returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis());
+        } catch (Throwable e) {
+            LOG.error(info(e, this), e);
             raiseEvent(DATA_SOURCE_EXCEPTION_EVENT, System.currentTimeMillis(),
-                    false, getExceptionMessage(e));
+                    true, getExceptionMessage(e));
         } finally {
-            updateAttemptsCounters.clear();
+            updateAttemptsCounters.values().stream().peek(a -> a.set(0)).close();
         }
     }
 
@@ -100,13 +100,12 @@ public void terminate() {
     public void addDataPoint(DataPointRT dataPoint) {
         try {
             updateAttemptsCounters.putIfAbsent(dataPoint.getId(), new AtomicInteger());
-            messagingService.initReceiver(dataPoint, getPointUpdateExceptionHandler(dataPoint), ATTR_UPDATE_ERROR_KEY);
-            dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, false);
-        } catch (Exception e) {
-            LOG.error(exceptionInfo(e), e);
+            messagingService.initReceiver(dataPoint, getPointUpdateExceptionHandler(dataPoint), getPointUpdateReturnToNormalHandler());
+            returnToNormal(DATA_POINT_INIT_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+        } catch (Throwable e) {
+            LOG.error(info(e, this), e);
             raiseEvent(DATA_POINT_INIT_EXCEPTION_EVENT, System.currentTimeMillis(),
-                    false, getExceptionMessage(e));
-            dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+                    true, getExceptionMessage(e), dataPoint);
         }
         super.addDataPoint(dataPoint);
     }
@@ -115,12 +114,13 @@ public void addDataPoint(DataPointRT dataPoint) {
     public void removeDataPoint(DataPointRT dataPoint) {
         try {
             messagingService.removeReceiver(dataPoint);
-        } catch (Exception e) {
-            LOG.error(exceptionInfo(e), e);
+            returnToNormal(DATA_POINT_INIT_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+        } catch (Throwable e) {
+            LOG.error(info(e, this), e);
             raiseEvent(DATA_POINT_INIT_EXCEPTION_EVENT, System.currentTimeMillis(),
-                    false, getExceptionMessage(e));
+                    true, getExceptionMessage(e), dataPoint);
         } finally {
-            updateAttemptsCounters.remove(dataPoint.getId());
+            updateAttemptsCounters.get(dataPoint.getId()).set(0);
         }
         super.removeDataPoint(dataPoint);
     }
@@ -129,35 +129,41 @@ public void removeDataPoint(DataPointRT dataPoint) {
     protected void doPoll(long time) {
         for (DataPointRT dataPoint : dataPoints) {
             try {
-                updateAttemptsCounters.putIfAbsent(dataPoint.getId(), new AtomicInteger());
-                if(updateAttemptsCounters.get(dataPoint.getId()).get() < updateAttempts) {
-                    messagingService.initReceiver(dataPoint, getPointUpdateExceptionHandler(dataPoint), ATTR_UPDATE_ERROR_KEY);
-                    updateAttemptsCounters.get(dataPoint.getId()).set(0);
-                    returnToNormal(DATA_POINT_INIT_EXCEPTION_EVENT, System.currentTimeMillis());
-                    dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, false);
+                if(!messagingService.isOpen(dataPoint)) {
+                    updateAttemptsCounters.putIfAbsent(dataPoint.getId(), new AtomicInteger());
+                    if (updateAttemptsCounters.get(dataPoint.getId()).get() < updateAttempts) {
+                        messagingService.initReceiver(dataPoint, getPointUpdateExceptionHandler(dataPoint), getPointUpdateReturnToNormalHandler());
+                        updateAttemptsCounters.get(dataPoint.getId()).set(0);
+                        returnToNormal(DATA_POINT_INIT_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
+                    }
+                } else {
+                    returnToNormal(DATA_POINT_INIT_EXCEPTION_EVENT, System.currentTimeMillis(), dataPoint);
                 }
-            } catch (Exception e) {
-                LOG.warn(exceptionInfo(e), e);
+            } catch (Throwable e) {
+                LOG.error(info(e, this), e);
                 int dataPointId = dataPoint.getId();
-                AtomicInteger counter = updateAttemptsCounters.get(dataPointId);
-                if(counter != null) {
-                    counter.incrementAndGet();
-                }
+                updateAttemptsCounters.computeIfPresent(dataPointId, (a,b) -> {b.incrementAndGet(); return b;});
                 raiseEvent(DATA_POINT_INIT_EXCEPTION_EVENT, System.currentTimeMillis(),
-                        true, getExceptionMessage(e));
-                dataPoint.setAttribute(ATTR_UNRELIABLE_KEY, true);
+                        true, getExceptionMessage(e), dataPoint);
             }
         }
     }
 
-    private java.util.function.Consumer<Exception> getPointUpdateExceptionHandler(DataPointRT dataPoint) {
+    private java.util.function.Consumer<Throwable> getPointUpdateExceptionHandler(DataPointRT dataPoint) {
         return ex -> {
             LOG.warn("Error Update: " + dataPointInfo(dataPoint.getVO()) + ", " + dataSourceInfo(vo) + ", "
                     + exceptionInfo(ex), ex);
             raiseEvent(DATA_POINT_UPDATE_EXCEPTION_EVENT, System.currentTimeMillis(),
-                    false, getExceptionMessage(new Exception("Error Update Data Point: " + dataPointInfo(dataPoint.getVO())
+                    true, getExceptionMessage(new Exception("Error Update Data Point: " + dataPointInfo(dataPoint.getVO())
                             + ", " + exceptionInfo(ex), ex)
-                    ));
+                    ), dataPoint);
+        };
+    }
+
+    private java.util.function.Supplier<Void> getPointUpdateReturnToNormalHandler() {
+        return () -> {
+            returnToNormal(DATA_POINT_UPDATE_EXCEPTION_EVENT, System.currentTimeMillis());
+            return null;
         };
     }
 }
\ No newline at end of file
diff --git a/src/org/scada_lts/ds/messaging/channel/InitMessagingChannels.java b/src/org/scada_lts/ds/messaging/channel/InitMessagingChannels.java
index a301f549ee..94ff8d43de 100644
--- a/src/org/scada_lts/ds/messaging/channel/InitMessagingChannels.java
+++ b/src/org/scada_lts/ds/messaging/channel/InitMessagingChannels.java
@@ -4,7 +4,8 @@
 import org.scada_lts.ds.messaging.exception.MessagingChannelException;
 
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 public interface InitMessagingChannels extends MessagingChannels {
-    void initChannel(DataPointRT dataPoint, Consumer<Exception> exceptionHandler, String updateErrorKey) throws MessagingChannelException;
+    void initChannel(DataPointRT dataPoint, Consumer<Throwable> exceptionHandler, Supplier<Void> returnToNormal) throws MessagingChannelException;
 }
diff --git a/src/org/scada_lts/ds/messaging/channel/MessagingChannelsImpl.java b/src/org/scada_lts/ds/messaging/channel/MessagingChannelsImpl.java
index 810439797e..e9e718185a 100644
--- a/src/org/scada_lts/ds/messaging/channel/MessagingChannelsImpl.java
+++ b/src/org/scada_lts/ds/messaging/channel/MessagingChannelsImpl.java
@@ -26,7 +26,7 @@ public void removeChannel(DataPointRT dataPoint) throws MessagingChannelExceptio
                 channel.close(timeout);
             } catch (MessagingChannelException e) {
                 throw e;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 throw new MessagingChannelException("Error Remove Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
             }
         }
@@ -46,7 +46,7 @@ public void initChannel(DataPointRT dataPoint, Supplier<MessagingChannel> create
             getChannelIfOpen(dataPoint).orElseGet(() -> operationChannels.createChannelIfNotExists(dataPoint.getId(), a -> create.get()));
         } catch (MessagingChannelException e) {
             throw e;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Init Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
         }
     }
@@ -58,7 +58,7 @@ public void publish(DataPointRT dataPoint, String message) {
                 channel.publish(message);
             } catch (MessagingChannelException e) {
                 throw e;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 throw new MessagingChannelException("Error Publish: " + dataPointInfo(dataPoint.getVO()) + ", Value: " + message + ", " + exceptionInfo(e), e);
             }
         });
diff --git a/src/org/scada_lts/ds/messaging/channel/NonSyncOperationChannels.java b/src/org/scada_lts/ds/messaging/channel/NonSyncOperationChannels.java
index 347018a3a9..82c912ee71 100644
--- a/src/org/scada_lts/ds/messaging/channel/NonSyncOperationChannels.java
+++ b/src/org/scada_lts/ds/messaging/channel/NonSyncOperationChannels.java
@@ -23,7 +23,7 @@ public void closeChannels(int timeout) throws MessagingChannelException {
         for(MessagingChannel channel: chs.values()) {
             try {
                 channel.close(timeout);
-            } catch (Exception ex) {
+            } catch (Throwable ex) {
                 LOG.warn("Error Init Channel: " + channel.getClass().getName() + ", " + exceptionInfo(ex), ex);
             }
         }
diff --git a/src/org/scada_lts/ds/messaging/channel/SyncOperationChannels.java b/src/org/scada_lts/ds/messaging/channel/SyncOperationChannels.java
index 08e823af3f..438208248c 100644
--- a/src/org/scada_lts/ds/messaging/channel/SyncOperationChannels.java
+++ b/src/org/scada_lts/ds/messaging/channel/SyncOperationChannels.java
@@ -1,7 +1,9 @@
 package org.scada_lts.ds.messaging.channel;
 
-import net.bull.javamelody.internal.common.LOG;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.scada_lts.ds.messaging.exception.MessagingChannelException;
+import org.scada_lts.ds.messaging.protocol.amqp.client.AmqpMessagingChannels;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,6 +14,8 @@
 
 class SyncOperationChannels implements OperationChannels {
 
+    private static final Log LOG = LogFactory.getLog(AmqpMessagingChannels.class);
+
     private final Map<Integer, MessagingChannel> channels;
     private final ReentrantReadWriteLock lock;
 
@@ -28,7 +32,7 @@ public void closeChannels(int timeout) throws MessagingChannelException {
             for(MessagingChannel channel: chs.values()) {
                 try {
                     channel.close(timeout);
-                } catch (Exception ex) {
+                } catch (Throwable ex) {
                     LOG.warn("Error Init Channel: " + channel.getClass().getName() + ", " + exceptionInfo(ex), ex);
                 }
             }
diff --git a/src/org/scada_lts/ds/messaging/channel/UpdatePointValueConsumer.java b/src/org/scada_lts/ds/messaging/channel/UpdatePointValueConsumer.java
index 29bdb9963e..ea50e9c3b1 100644
--- a/src/org/scada_lts/ds/messaging/channel/UpdatePointValueConsumer.java
+++ b/src/org/scada_lts/ds/messaging/channel/UpdatePointValueConsumer.java
@@ -4,20 +4,20 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 public class UpdatePointValueConsumer implements Consumer<byte[]> {
 
     private final DataPointRT dataPoint;
     private final Writable writable;
-    private final String updateErrorKey;
-    private final Consumer<Exception> exceptionHandler;
+    private final Consumer<Throwable> exceptionHandler;
+    private final Supplier<Void> returnToNormal;
 
-    public UpdatePointValueConsumer(DataPointRT dataPoint, Writable writable,
-                                    String updateErrorKey, Consumer<Exception> exceptionHandler) {
+    public UpdatePointValueConsumer(DataPointRT dataPoint, Writable writable, Consumer<Throwable> exceptionHandler, Supplier<Void> returnToNormal) {
         this.dataPoint = dataPoint;
         this.writable = writable;
-        this.updateErrorKey = updateErrorKey;
         this.exceptionHandler = exceptionHandler;
+        this.returnToNormal = returnToNormal;
     }
 
     @Override
@@ -26,10 +26,9 @@ public void accept(byte[] payload) {
             try {
                 String message = new String(payload, StandardCharsets.UTF_8);
                 dataPoint.updatePointValue(message);
-                dataPoint.setAttribute(updateErrorKey, false);
-            } catch (Exception ex) {
+                returnToNormal.get();
+            } catch (Throwable ex) {
                 exceptionHandler.accept(ex);
-                dataPoint.setAttribute(updateErrorKey, true);
             }
         }
     }
diff --git a/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpChannelFactory.java b/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpChannelFactory.java
index 5589435ec0..f6d6762461 100644
--- a/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpChannelFactory.java
+++ b/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpChannelFactory.java
@@ -8,17 +8,17 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 final class AmqpChannelFactory {
 
     private AmqpChannelFactory() {}
 
-    static AmqpChannel createReceiver(DataPointRT dataPoint, AmqpConnection connection, Consumer<Exception> exceptionHandler,
-                                      String updateErrorKey) throws IOException {
+    static AmqpChannel createReceiver(DataPointRT dataPoint, AmqpConnection connection, Consumer<Throwable> exceptionHandler, Supplier<Void> returnToNormal) throws IOException {
         AmqpChannel receive = configChannel(dataPoint, connection);
         if(receive == null)
             return null;
-        basicConsume(dataPoint, receive, exceptionHandler, updateErrorKey);
+        basicConsume(dataPoint, receive, exceptionHandler, returnToNormal);
         return receive;
     }
 
@@ -59,13 +59,11 @@ private static void basicQos(AmqpChannel channel, AmqpPointLocatorVO vo) throws
         channel.basicQos(vo.getQos());
     }
 
-    private static void basicConsume(DataPointRT dataPoint, AmqpChannel channel, Consumer<Exception> exceptionHandler,
-                                     String updateErrorKey) throws IOException {
+    private static void basicConsume(DataPointRT dataPoint, AmqpChannel channel, Consumer<Throwable> exceptionHandler, Supplier<Void> returnToNormal) throws IOException {
         AmqpPointLocatorRT locator = dataPoint.getPointLocator();
         AmqpPointLocatorVO vo = locator.getVO();
         boolean noAck = vo.getMessageAck() == MessageAckType.NO_ACK;
-        channel.basicConsume(vo.getQueueName(), noAck, new UpdatePointValueConsumer(dataPoint, vo::isWritable,
-                updateErrorKey, exceptionHandler));
+        channel.basicConsume(vo.getQueueName(), noAck, new UpdatePointValueConsumer(dataPoint, vo::isWritable, exceptionHandler, returnToNormal));
     }
 
     private static void declare(AmqpChannel channel, AmqpPointLocatorVO vo) throws IOException {
diff --git a/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpMessagingChannel.java b/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpMessagingChannel.java
index b10b51c995..c5ef9311e1 100644
--- a/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpMessagingChannel.java
+++ b/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpMessagingChannel.java
@@ -32,7 +32,7 @@ public void close(int timeout) throws MessagingChannelException {
             channel.close();
         } catch (IOException e) {
             throw new MessagingChannelException("Error Close Channel: " + dataPointInfo(dataPointRT.getVO()) + ", " + causeInfo(e), e.getCause());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Close Channel: " + dataPointInfo(dataPointRT.getVO()) + ", " + exceptionInfo(e), e);
         }
     }
@@ -43,7 +43,7 @@ public void publish(String message) throws MessagingChannelException {
             basicPublish(dataPointRT, channel, message);
         } catch (IOException e) {
             throw new MessagingChannelException("Error Publish: " + dataPointInfo(dataPointRT.getVO()) + ", " + causeInfo(e), e.getCause());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Publish: " + dataPointInfo(dataPointRT.getVO()) + ", " + exceptionInfo(e), e);
         }
     }
diff --git a/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpMessagingChannels.java b/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpMessagingChannels.java
index d07485cd71..ccbb63a99e 100644
--- a/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpMessagingChannels.java
+++ b/src/org/scada_lts/ds/messaging/protocol/amqp/client/AmqpMessagingChannels.java
@@ -37,11 +37,11 @@ public void openConnection() throws MessagingChannelException {
         } catch (IOException e) {
             try {
                 connectionManager.close();
-            } catch (Exception ex) {
+            } catch (Throwable ex) {
                 LOG.warn("Error Close Channel: " + exceptionInfo(e), e);
             }
             throw new MessagingChannelException("Error Open Channel: " + causeInfo(e), e.getCause());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             try {
                 connectionManager.close();
             } catch (Exception ex) {
@@ -57,7 +57,7 @@ public void removeChannel(DataPointRT dataPoint) throws MessagingChannelExceptio
             channels.removeChannel(dataPoint);
         } catch (MessagingChannelException e) {
             throw e;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Remove Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
         } finally {
             if (channels.size() == 0) {
@@ -76,20 +76,20 @@ public boolean isOpenChannel(DataPointRT dataPoint) {
     }
 
     @Override
-    public void initChannel(DataPointRT dataPoint, Consumer<Exception> exceptionHandler, String updateErrorKey) throws MessagingChannelException {
+    public void initChannel(DataPointRT dataPoint, Consumer<Throwable> exceptionHandler, Supplier<Void> returnToNormal) throws MessagingChannelException {
         connectionManager.getIfOpen().or(() -> {
             try {
                 return Optional.ofNullable(connectionManager.open(vo));
             } catch (IOException e) {
                 throw new MessagingChannelException("Error Open Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + causeInfo(e), e.getCause());
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 throw new MessagingChannelException("Error Open Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
             }
         }).ifPresent(conn -> {
             try {
                 channels.initChannel(dataPoint, () -> {
                     try {
-                        return new AmqpMessagingChannel(AmqpChannelFactory.createReceiver(dataPoint, conn, exceptionHandler, updateErrorKey), dataPoint);
+                        return new AmqpMessagingChannel(AmqpChannelFactory.createReceiver(dataPoint, conn, exceptionHandler, returnToNormal), dataPoint);
                     } catch (IOException e) {
                         throw new MessagingChannelException("Error Create Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + causeInfo(e), e.getCause());
                     } catch (Exception e) {
@@ -97,7 +97,7 @@ public void initChannel(DataPointRT dataPoint, Consumer<Exception> exceptionHand
                     }});
             } catch (MessagingChannelException e) {
                 throw e;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 throw new MessagingChannelException("Error Init Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
             }
         });
@@ -110,7 +110,7 @@ public void initChannel(DataPointRT dataPoint, Supplier<MessagingChannel> create
                 return Optional.ofNullable(connectionManager.open(vo));
             } catch (IOException e) {
                 throw new MessagingChannelException("Error Open Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + causeInfo(e), e.getCause());
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 throw new MessagingChannelException("Error Open Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
             }
         }).ifPresent(conn -> {
@@ -118,7 +118,7 @@ public void initChannel(DataPointRT dataPoint, Supplier<MessagingChannel> create
                 channels.initChannel(dataPoint, create);
             } catch (MessagingChannelException e) {
                 throw e;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 throw new MessagingChannelException("Error Init Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
             }
         });
@@ -131,7 +131,7 @@ public void publish(DataPointRT dataPoint, String message) throws MessagingChann
                 return Optional.ofNullable(connectionManager.open(vo));
             } catch (IOException e) {
                 throw new MessagingChannelException("Error Open Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + causeInfo(e), e.getCause());
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 throw new MessagingChannelException("Error Open Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
             }
         }).ifPresent(conn -> {
@@ -139,7 +139,7 @@ public void publish(DataPointRT dataPoint, String message) throws MessagingChann
                 channels.publish(dataPoint, message);
             } catch (MessagingChannelException e) {
                 throw e;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 throw new MessagingChannelException("Error Publish: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
             }
         });
@@ -154,12 +154,12 @@ public boolean isOpenConnection() {
     public void closeChannels() throws MessagingChannelException {
         try {
             channels.closeChannels();
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
             LOG.warn("Error Close Channels: " + exceptionInfo(ex), ex);
         } finally {
             try {
                 connectionManager.close();
-            } catch (IOException e) {
+            } catch (Throwable e) {
                 LOG.warn("Error Close Connection: " + exceptionInfo(e), e);
             }
         }
diff --git a/src/org/scada_lts/ds/messaging/protocol/mqtt/client/MqttMessagingChannel.java b/src/org/scada_lts/ds/messaging/protocol/mqtt/client/MqttMessagingChannel.java
index 02a63ba2eb..365dc64e1c 100644
--- a/src/org/scada_lts/ds/messaging/protocol/mqtt/client/MqttMessagingChannel.java
+++ b/src/org/scada_lts/ds/messaging/protocol/mqtt/client/MqttMessagingChannel.java
@@ -36,12 +36,12 @@ public void close(int timeout) throws MessagingChannelException {
             client.disconnect(timeout);
         } catch (IOException e) {
             throw new MessagingChannelException("Error Disconnect Channel: " + dataPointInfo(dataPointRT.getVO()) + ", " + causeInfo(e), e.getCause());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Disconnect Channel: " + dataPointInfo(dataPointRT.getVO()) + ", " + exceptionInfo(e), e);
         } finally {
             try {
                 client.close();
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 LOG.warn("Error Close Channel: " + dataPointInfo(dataPointRT.getVO()) + ", " + exceptionInfo(e), e);
             }
         }
@@ -54,7 +54,7 @@ public void publish(String message) throws MessagingChannelException {
         try {
             client.publish(locator.getTopicFilter(), message.getBytes(StandardCharsets.UTF_8),
                     locator.getQos(), locator.isRetained());
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
             throw new RuntimeException("Error Publish: " + dataPointInfo(dataPointRT.getVO())+ ", Value: " + message + ", " + exceptionInfo(ex), ex);
         }
     }
diff --git a/src/org/scada_lts/ds/messaging/protocol/mqtt/client/MqttMessagingChannels.java b/src/org/scada_lts/ds/messaging/protocol/mqtt/client/MqttMessagingChannels.java
index 1dfa13dc8b..3bd5825f7e 100644
--- a/src/org/scada_lts/ds/messaging/protocol/mqtt/client/MqttMessagingChannels.java
+++ b/src/org/scada_lts/ds/messaging/protocol/mqtt/client/MqttMessagingChannels.java
@@ -35,7 +35,7 @@ public void removeChannel(DataPointRT dataPoint) throws MessagingChannelExceptio
             channels.removeChannel(dataPoint);
         } catch (MessagingChannelException e) {
             throw e;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Remove Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
         }
     }
@@ -46,18 +46,18 @@ public boolean isOpenChannel(DataPointRT dataPoint) {
     }
 
     @Override
-    public void initChannel(DataPointRT dataPoint, Consumer<Exception> exceptionHandler, String updateErrorKey) throws MessagingChannelException {
+    public void initChannel(DataPointRT dataPoint, Consumer<Throwable> exceptionHandler, Supplier<Void> returnToNormal) throws MessagingChannelException {
         try {
             channels.initChannel(dataPoint, () -> {
                 try {
-                    return new MqttMessagingChannel(createClient(dataPoint, exceptionHandler, updateErrorKey), dataPoint);
-                } catch (Exception e) {
+                    return new MqttMessagingChannel(createClient(dataPoint, exceptionHandler, returnToNormal), dataPoint);
+                } catch (Throwable e) {
                     throw new MessagingChannelException("Error Create Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + causeInfo(e), e.getCause());
                 }
             });
         } catch (MessagingChannelException e) {
             throw e;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Init Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
         }
     }
@@ -68,7 +68,7 @@ public void initChannel(DataPointRT dataPoint, Supplier<MessagingChannel> create
             channels.initChannel(dataPoint, create);
         } catch (MessagingChannelException e) {
             throw e;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Init Channel: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
         }
     }
@@ -79,7 +79,7 @@ public void publish(DataPointRT dataPoint, String message) throws MessagingChann
             channels.publish(dataPoint, message);
         } catch (MessagingChannelException e) {
             throw e;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Publish: " + dataPointInfo(dataPoint.getVO()) + ", " + exceptionInfo(e), e);
         }
     }
@@ -93,8 +93,8 @@ public boolean isOpenConnection() {
     public void closeChannels() throws MessagingChannelException {
         try {
             channels.closeChannels();
-        } catch (Exception ex) {
-            LOG.warn("Error Close Channels: " + exceptionInfo(ex), ex);
+        } catch (Throwable ex) {
+            LOG.warn("Error Close Channels: " + dataSourceInfo(vo) + ", " +  exceptionInfo(ex), ex);
         }
     }
 
@@ -103,7 +103,7 @@ public int size() {
         return channels.size();
     }
 
-    private MqttVClient createClient(DataPointRT dataPoint, Consumer<Exception> exceptionHandler, String updateErrorKey) throws MessagingChannelException {
+    private MqttVClient createClient(DataPointRT dataPoint, Consumer<Throwable> exceptionHandler, Supplier<Void> returnToNormal) throws MessagingChannelException {
         MqttPointLocatorRT pointLocator = dataPoint.getPointLocator();
         MqttPointLocatorVO locator = pointLocator.getVO();
 
@@ -111,21 +111,21 @@ private MqttVClient createClient(DataPointRT dataPoint, Consumer<Exception> exce
         try {
             MqttVersion mqttVersion = (MqttVersion) vo.getProtocolVersion();
             client = mqttVersion.newClient(vo, locator);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Create Client: " + dataSourcePointInfo(vo, dataPoint.getVO()) + ", " + exceptionInfo(e), e);
         }
         try {
             client.connect();
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingChannelException("Error Connect Client: " + dataSourcePointInfo(vo, dataPoint.getVO()) + ", " + exceptionInfo(e), e);
         }
         try {
             client.subscribe(locator.getTopicFilter(), locator.getQos(), (topic, mqttMessage) ->
-                    new UpdatePointValueConsumer(dataPoint, locator::isWritable, updateErrorKey, exceptionHandler).accept(mqttMessage.getPayload()));
-        } catch (Exception e) {
+                    new UpdatePointValueConsumer(dataPoint, locator::isWritable, exceptionHandler, returnToNormal).accept(mqttMessage.getPayload()));
+        } catch (Throwable e) {
             try {
                 close(client);
-            } catch (Exception ex) {
+            } catch (Throwable ex) {
                 LOG.warn("Error Close Client: " + dataSourcePointInfo(vo, dataPoint.getVO()) + ", " + exceptionInfo(ex), ex);
             }
             throw new MessagingChannelException("Error Subscribe Client: " + dataSourcePointInfo(vo, dataPoint.getVO()) + ", " + exceptionInfo(e), e);
diff --git a/src/org/scada_lts/ds/messaging/service/MessagingService.java b/src/org/scada_lts/ds/messaging/service/MessagingService.java
index 9d66fd17d3..5ad44202e4 100644
--- a/src/org/scada_lts/ds/messaging/service/MessagingService.java
+++ b/src/org/scada_lts/ds/messaging/service/MessagingService.java
@@ -4,6 +4,7 @@
 import org.scada_lts.ds.messaging.exception.MessagingServiceException;
 
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 public interface MessagingService {
 
@@ -12,7 +13,7 @@ public interface MessagingService {
     void open() throws MessagingServiceException;
     void close() throws MessagingServiceException;
 
-    void initReceiver(DataPointRT dataPoint, Consumer<Exception> updateExceptionHandler, String updateErrorKey) throws MessagingServiceException;
+    void initReceiver(DataPointRT dataPoint, Consumer<Throwable> updateExceptionHandler, Supplier<Void> returnToNormal) throws MessagingServiceException;
     void removeReceiver(DataPointRT dataPoint) throws MessagingServiceException;
     void publish(DataPointRT dataPoint, String message) throws MessagingServiceException;
 }
diff --git a/src/org/scada_lts/ds/messaging/service/MessagingServiceImpl.java b/src/org/scada_lts/ds/messaging/service/MessagingServiceImpl.java
index cb9d44768f..a1f3fbe0f1 100644
--- a/src/org/scada_lts/ds/messaging/service/MessagingServiceImpl.java
+++ b/src/org/scada_lts/ds/messaging/service/MessagingServiceImpl.java
@@ -8,6 +8,7 @@
 import org.scada_lts.ds.messaging.exception.MessagingServiceException;
 
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static com.serotonin.mango.util.LoggingUtils.*;
 
@@ -30,27 +31,27 @@ class MessagingServiceImpl implements MessagingService {
     @Override
     public void publish(DataPointRT dataPoint, String message) throws MessagingServiceException {
         if(blocked) {
-            throw new MessagingServiceException("Stop Publish: " + dataSourceInfo(vo) + ", Service of shutting down:  "  + dataSourceInfo(vo) + ", Value: " + message);
+            throw new MessagingServiceException("Stop Publish: " + dataPointInfo(dataPoint) + ", Service of shutting down:  "  + dataSourceInfo(vo) + ", Value: " + message);
         }
         try {
             channels.publish(dataPoint, message);
-        } catch (Exception e) {
-            throw new MessagingServiceException("Error Publish: " + dataSourceInfo(vo) + ", Value: " + message + ", " + exceptionInfo(e), e);
+        } catch (Throwable e) {
+            throw new MessagingServiceException("Error Publish: " + dataPointInfo(dataPoint) + ", Value: " + message + ", " + exceptionInfo(e), e);
         }
     }
 
     @Override
-    public void initReceiver(DataPointRT dataPoint, Consumer<Exception> exceptionHandler, String updateErrorKey) throws MessagingServiceException {
+    public void initReceiver(DataPointRT dataPoint, Consumer<Throwable> exceptionHandler, Supplier<Void> returnToNormal) throws MessagingServiceException {
         if(blocked) {
-            LOG.warn("Stop Init Receiver: " + dataSourceInfo(vo) + ", Service of shutting down: "  + dataSourceInfo(vo));
+            LOG.warn("Stop Init Receiver: " + dataPointInfo(dataPoint) + ", Service of shutting down: "  + dataSourceInfo(vo));
             return;
         }
         if(isOpen(dataPoint)) {
             return;
         }
         try {
-            channels.initChannel(dataPoint, exceptionHandler, updateErrorKey);
-        } catch (Exception e) {
+            channels.initChannel(dataPoint, exceptionHandler, returnToNormal);
+        } catch (Throwable e) {
             throw new MessagingServiceException("Error Init Receiver: " + dataSourceInfo(vo) + ", " + exceptionInfo(e), e);
         }
     }
@@ -58,12 +59,12 @@ public void initReceiver(DataPointRT dataPoint, Consumer<Exception> exceptionHan
     @Override
     public void removeReceiver(DataPointRT dataPoint) throws MessagingServiceException {
         if(blocked) {
-            LOG.warn("Stop Remove Receiver: " + dataSourceInfo(vo) + ", Service of shutting down: "  + dataSourceInfo(vo));
+            LOG.warn("Stop Remove Receiver: " + dataPointInfo(dataPoint) + ", Service of shutting down: "  + dataSourceInfo(vo));
             return;
         }
         try {
             channels.removeChannel(dataPoint);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingServiceException("Error Remove Receiver: " + dataSourceInfo(vo) + ", " + exceptionInfo(e), e);
         }
     }
@@ -80,16 +81,14 @@ public boolean isOpen(DataPointRT dataPoint) {
 
     @Override
     public void open() throws MessagingServiceException {
-        if(blocked) {
-            throw new MessagingServiceException("Stop Open Connection: Service of shutting down:  "  + dataSourceInfo(vo));
-        }
         if(channels.isOpenConnection()) {
+            blocked = false;
             LOG.warn("Stop Open Connection: Connection is opened:  "  + dataSourceInfo(vo));
             return;
         }
         try {
             channels.openConnection();
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new MessagingServiceException("Error Open Connection: " + dataSourceInfo(vo) + ", " + exceptionInfo(e), e);
         }
         blocked = false;
@@ -100,7 +99,7 @@ public void close() throws MessagingServiceException {
         blocked = true;
         try {
             channels.closeChannels();
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
             LOG.warn("Error Close Receivers: " + dataSourceInfo(vo) + ", " + exceptionInfo(ex), ex);
         }
     }
diff --git a/src/org/scada_lts/login/ILoggedUsers.java b/src/org/scada_lts/login/ILoggedUsers.java
index 1c548e63f3..07cdc391e9 100644
--- a/src/org/scada_lts/login/ILoggedUsers.java
+++ b/src/org/scada_lts/login/ILoggedUsers.java
@@ -2,6 +2,7 @@
 
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
 import com.serotonin.mango.vo.User;
+import org.apache.catalina.Session;
 
 import javax.servlet.http.HttpSession;
 import java.util.Collection;
@@ -15,4 +16,5 @@ public interface ILoggedUsers {
     Set<Integer> getUserIds();
     Collection<User> getUsers();
     User getUser(int id);
+    void loadSessions(Session[] sessions);
 }
diff --git a/src/org/scada_lts/login/LoggedUsers.java b/src/org/scada_lts/login/LoggedUsers.java
index 6f67fe10c8..c4dccddb07 100644
--- a/src/org/scada_lts/login/LoggedUsers.java
+++ b/src/org/scada_lts/login/LoggedUsers.java
@@ -3,9 +3,14 @@
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
 import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.vo.User;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.catalina.Session;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.scada_lts.mango.service.UserService;
+import org.scada_lts.web.beans.ApplicationBeans;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContext;
 
 import javax.servlet.http.HttpSession;
 import java.util.*;
@@ -17,23 +22,18 @@
 
 public class LoggedUsers implements ILoggedUsers {
 
-    private static final Log LOG = LogFactory.getLog(LoggedUsers.class);
-
-    public LoggedUsers() {}
+    private static final Logger LOG = LogManager.getLogger(LoggedUsers.class);
 
     private final Map<Integer, User> loggedUsers = new ConcurrentHashMap<>();
     private final Map<Integer, List<HttpSession>> loggedSessions = new ConcurrentHashMap<>();
     private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-    private final ThreadLocal<String> blocked = new ThreadLocal<>();
+
+    public LoggedUsers() {}
 
     @Override
     public User addUser(User user, HttpSession session) {
         lock.writeLock().lock();
         try {
-            if("setAttribute".equals(blocked.get())) {
-                LOG.warn("blocked addUser: " + LoggingUtils.userInfo(user) + ", thread: " + Thread.currentThread().getName());
-                return null;
-            }
             loggedSessions.putIfAbsent(user.getId(), new CopyOnWriteArrayList<>());
             if(!loggedSessions.get(user.getId()).contains(session)) {
                 loggedSessions.get(user.getId()).add(session);
@@ -50,7 +50,7 @@ public User addUser(User user, HttpSession session) {
     public void updateUser(User user) {
         lock.writeLock().lock();
         try {
-            update(user, loggedUsers, loggedSessions, blocked);
+            update(user, loggedUsers, loggedSessions);
         } finally {
             lock.writeLock().unlock();
         }
@@ -63,7 +63,7 @@ public void updateUsers(UsersProfileVO profile) {
             for(User user: new ArrayList<>(loggedUsers.values())) {
                 if(user.getUserProfile() == profile.getId()) {
                     profile.apply(user);
-                    update(user, loggedUsers, loggedSessions, blocked);
+                    update(user, loggedUsers, loggedSessions);
                 }
             }
         } finally {
@@ -75,10 +75,6 @@ public void updateUsers(UsersProfileVO profile) {
     public User removeUser(User user, HttpSession session) {
         lock.writeLock().lock();
         try {
-            if("setAttribute".equals(blocked.get())) {
-                LOG.warn("blocked removeUser: " + LoggingUtils.userInfo(user) + ", thread: " + Thread.currentThread().getName());
-                return null;
-            }
             if (loggedSessions.get(user.getId()) == null || (loggedSessions.get(user.getId()).remove(session)
                     && loggedSessions.get(user.getId()).isEmpty())) {
                 loggedSessions.remove(user.getId());
@@ -120,9 +116,31 @@ public User getUser(int id) {
         }
     }
 
+    @Override
+    public void loadSessions(Session[] sessions) {
+        for(Session session: sessions) {
+            HttpSession httpSession = session.getSession();
+            UserService userService = ApplicationBeans.getBean("userService", UserService.class);
+            SecurityContext securityContext = (SecurityContext)httpSession.getAttribute("SPRING_SECURITY_CONTEXT");
+            if(securityContext != null) {
+                Authentication authentication = securityContext.getAuthentication();
+                if(authentication != null) {
+                    String username = authentication.getName();
+                    User sessionUser = userService.getUser(username);
+                    if (sessionUser != null && (!sessionUser.isAdmin() || isAdmin(authentication))) {
+                        int userId = sessionUser.getId();
+                        loggedSessions.putIfAbsent(userId, new ArrayList<>());
+                        loggedSessions.get(userId).add(httpSession);
+                        loggedUsers.put(userId, sessionUser);
+                        LOG.info("Loaded session for user: {}", username);
+                    }
+                }
+            }
+        }
+    }
+
     private static void update(User user, Map<Integer, User> loggedUsers,
-                               Map<Integer, List<HttpSession>> loggedSessions,
-                               ThreadLocal<String> blocked) {
+                               Map<Integer, List<HttpSession>> loggedSessions) {
         User loggedUser = loggedUsers.get(user.getId());
         if(loggedUser == null) {
             LOG.warn("not logged user: " + LoggingUtils.userInfo(user) + ", thread: " + Thread.currentThread().getName());
@@ -133,10 +151,17 @@ private static void update(User user, Map<Integer, User> loggedUsers,
             user.setAttribute("roles", roles);
         loggedSessions.putIfAbsent(user.getId(), new CopyOnWriteArrayList<>());
         for(HttpSession session : loggedSessions.get(user.getId())) {
-            blocked.set("setAttribute");
             session.setAttribute(SESSION_USER, user);
-            blocked.set("");
         }
         loggedUsers.put(user.getId(), user);
     }
+
+    private static boolean isAdmin(Authentication authentication) {
+        for(GrantedAuthority authority: authentication.getAuthorities()) {
+            if("ROLE_ADMIN".equals(authority.getAuthority())) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/org/scada_lts/mango/adapter/MangoEvent.java b/src/org/scada_lts/mango/adapter/MangoEvent.java
index cab5948e6e..253c35b240 100644
--- a/src/org/scada_lts/mango/adapter/MangoEvent.java
+++ b/src/org/scada_lts/mango/adapter/MangoEvent.java
@@ -24,6 +24,7 @@
 
 import com.serotonin.mango.rt.event.EventInstance;
 import com.serotonin.mango.rt.event.type.EventType;
+import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.UserComment;
 import com.serotonin.mango.vo.event.EventHandlerVO;
 import com.serotonin.mango.vo.event.EventTypeVO;
@@ -37,9 +38,11 @@
 public interface MangoEvent {
 	
 	void saveEvent(EventInstance event);
-	
+
+	@Deprecated(since = "2.8.0")
 	void ackEvent(int eventId, long time, int userId, int alternateAckSource, boolean signalAlarmLevelChange);
-	
+
+	@Deprecated(since = "2.8.0")
 	void ackEvent(int eventId, long time, int userId, int alternateAckSource);
 
     void silenceEvent(int eventId, int userId);
@@ -50,8 +53,10 @@ public interface MangoEvent {
 
 	void unsilenceEvents(List<Integer> eventIds, int userId);
 
+	@Deprecated(since = "2.8.0")
 	void ackAllPending(long time, int userId, int alternateAckSource);
 
+	@Deprecated(since = "2.8.0")
     void silenceAll(int userId);
 
     void ackSelected(long time, int userId, int alternateAckSource, List<Integer> ids);
@@ -116,9 +121,10 @@ public interface MangoEvent {
 	void updateEventHandler(EventHandlerVO handler);
 	
 	void deleteEventHandler(final int handlerId);
-	
+
+	@Deprecated(since = "2.8.0")
 	boolean toggleSilence(int eventId, int userId);
-	
+
 	int getHighestUnsilencedAlarmLevel(int userId);
 
 	EventInstance getEvent(int eventId);
@@ -128,4 +134,15 @@ public interface MangoEvent {
 	boolean isXidUnique(String xid, int excludeId);
 
 	List<EventInstance> getPendingEventsAlarmLevelMin(int userId, int alarmLevelMin, int limit);
+
+	boolean toggleSilence(EventInstance event, User user);
+
+	boolean assignEvent(EventInstance event, User user);
+	boolean unassignEvent(EventInstance event, User user);
+
+	void ackEvent(EventInstance event, long time, User user, int alternateAckSource, boolean signalAlarmLevelChange);
+	void ackEvent(EventInstance event, long time, User user, int alternateAckSource);
+	void unassignEvents();
+	void ackEvents(User user);
+	List<Integer> silenceEvents(User user);
 }
diff --git a/src/org/scada_lts/mango/adapter/MangoReport.java b/src/org/scada_lts/mango/adapter/MangoReport.java
index de5d61d29e..96bf21f136 100644
--- a/src/org/scada_lts/mango/adapter/MangoReport.java
+++ b/src/org/scada_lts/mango/adapter/MangoReport.java
@@ -46,6 +46,7 @@ public interface MangoReport {
 
 	void saveReport(ReportVO report);
 
+	@Deprecated(since = "2.8.0")
 	void deleteReport(int reportId);
 
 	List<ReportInstance> getReportInstances(int userId);
@@ -91,4 +92,6 @@ public interface MangoReport {
 	boolean hasReportInstanceSetPermission(User user, int reportInstanceId);
 
 	boolean hasReportInstanceOwnerPermission(User user, int reportInstanceId);
+
+	void deleteReport(ReportVO report);
 }
diff --git a/src/org/scada_lts/mango/adapter/MangoScadaConfig.java b/src/org/scada_lts/mango/adapter/MangoScadaConfig.java
index 4781584670..27f05773fd 100644
--- a/src/org/scada_lts/mango/adapter/MangoScadaConfig.java
+++ b/src/org/scada_lts/mango/adapter/MangoScadaConfig.java
@@ -21,6 +21,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.config.ScadaConfig;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.web.mvc.api.css.CssStyle;
+import org.scada_lts.web.mvc.api.css.CustomCssUtils;
 
 
 /** 
@@ -55,6 +58,11 @@ public void init() {
 			 LOG.info("copy env.properties");
 			 ScadaConfig.copyConfig();
 		 }
+
+		LOG.info("loading user_styles.css form database");
+		SystemSettingsService service = new SystemSettingsService();
+		CssStyle cssStyle = service.getCustomCss();
+		CustomCssUtils.saveToFile(cssStyle);
 				
 	}
 
diff --git a/src/org/scada_lts/mango/service/DataPointService.java b/src/org/scada_lts/mango/service/DataPointService.java
index ba428095cd..758ee59c8e 100644
--- a/src/org/scada_lts/mango/service/DataPointService.java
+++ b/src/org/scada_lts/mango/service/DataPointService.java
@@ -46,7 +46,6 @@
 import org.scada_lts.dao.*;
 import org.scada_lts.dao.model.point.PointValue;
 import org.scada_lts.dao.pointhierarchy.PointHierarchyDAO;
-import org.scada_lts.dao.PointLinkDAO;
 import org.scada_lts.dao.pointvalues.PointValueAmChartDAO;
 import org.scada_lts.dao.pointvalues.PointValueDAO;
 import org.scada_lts.dao.pointvalues.PointValueDAO4REST;
@@ -255,27 +254,6 @@ public List<PointValueDTO> valuesPointBooleanBaseOnNameFilter2DTO(Map<DataPointV
 		return result;
 	}
 
-	@Deprecated(since = "2.7.7")
-	public void save(User user, String value, String xid, int pointValueType) {
-		DataPointVO dpvo = dataPointDAO.getDataPoint(xid);
-		new PointValueDAO4REST().save(value, pointValueType, dpvo.getId());
-		setPoint(user, dpvo, value);
-	}
-
-	@Deprecated(since = "2.7.7")
-	private void setPoint(User user, DataPointVO point, String valueStr) {
-		Permissions.ensureDataPointSetPermission(user, point);
-		setPointImpl(point, valueStr, user);
-
-	}
-
-	@Deprecated(since = "2.7.7")
-	public void saveAPI(User user, String value, String xid) {
-		DataPointVO dpvo = dataPointDAO.getDataPoint(xid);
-		Permissions.ensureDataPointSetPermission(user, dpvo);
-		setPointImpl(dpvo, value, user);
-	}
-
 	public void save(User user, String value, String xid, int pointValueType, SetPointSource source) {
 		DataPointVO point = dataPointDAO.getDataPoint(xid);
 		if(point == null || point.getPointLocator() == null)
@@ -536,7 +514,7 @@ public void saveEventDetectors(DataPointVO dataPoint) {
 		for (PointEventDetectorVO pointEventDetector: dataPoint.getEventDetectors()) {
 			try {
 				pointEventDetectorDAO.insert(dataPoint.getId(), pointEventDetector);
-			} catch (DuplicateKeyException e) {
+			} catch (Exception e) {
 				pointEventDetectorDAO.update(dataPoint.getId(), pointEventDetector);
 			}
 		}
@@ -681,6 +659,11 @@ public List<DataPointVO> getDataPointsByXid(Set<String> xids) {
 		return pointIds;
 	}
 
+	public boolean isDataPointRunning(DataPointVO dataPoint){
+		DataSourceVO<?> dataSourceVO = dataSourceDAO.getDataSource(dataPoint.getDataSourceId());
+        return dataPoint.isEnabled() && dataSourceVO.isEnabled();
+	}
+
 	private List<PointValueAmChartDAO.DataPointSimpleValue> aggregateValuesFromRange(long startTs, long endTs,
 																					 List<DataPointVO> pointIds,
 																					 AggregateSettings aggregateSettings) {
diff --git a/src/org/scada_lts/mango/service/EventService.java b/src/org/scada_lts/mango/service/EventService.java
index 25b53c9222..a45ca1ff52 100644
--- a/src/org/scada_lts/mango/service/EventService.java
+++ b/src/org/scada_lts/mango/service/EventService.java
@@ -24,12 +24,15 @@
 import com.serotonin.mango.rt.event.type.AuditEventType;
 import com.serotonin.mango.rt.event.type.AuditEventUtils;
 import com.serotonin.mango.rt.event.type.EventType;
+import com.serotonin.mango.rt.event.type.SystemEventType;
 import com.serotonin.mango.rt.maint.work.AbstractBeforeAfterWorkItem;
 import com.serotonin.mango.rt.maint.work.WorkItemPriority;
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.UserComment;
 import com.serotonin.mango.vo.event.EventHandlerVO;
 import com.serotonin.mango.vo.event.EventTypeVO;
+import com.serotonin.web.i18n.LocalizableMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.cache.PendingEventsCache;
@@ -72,7 +75,7 @@ public EventService() {
 		eventDAO = new EventDAO();
 		userEventDAO = new UserEventDAO();
 		userCommentDAO = ApplicationBeans.getUserCommentDaoBean();
-		systemSettingsService = new SystemSettingsService();
+		systemSettingsService = ApplicationBeans.getBean("systemSettingsService", SystemSettingsService.class);
 	}
 
 	class UserPendingEventRetriever extends AbstractBeforeAfterWorkItem implements Runnable {
@@ -135,13 +138,15 @@ public void saveEvent(EventInstance event) {
 			updateCache(event);
 		}
 	}
-	
+
+	@Deprecated(since = "2.8.0")
 	@Transactional(readOnly = false,propagation= Propagation.REQUIRES_NEW,isolation= Isolation.READ_COMMITTED,rollbackFor=SQLException.class)
 	@Override
 	public void ackEvent(int eventId, long time, int userId, int alternateAckSource, boolean signalAlarmLevelChange) {
 		_ackEvent(eventId, time, userId, alternateAckSource, signalAlarmLevelChange);
 	}
 
+	@Deprecated(since = "2.8.0")
 	@Transactional(readOnly = false,propagation= Propagation.REQUIRES_NEW,isolation= Isolation.READ_COMMITTED,rollbackFor=SQLException.class)
 	@Override
 	public void ackEvent(int eventId, long time, int userId, int alternateAckSource) {
@@ -170,12 +175,18 @@ public void unsilenceEvents(List<Integer> eventIds, int userId) {
 
 	@Override
 	public void ackAllPending(long time, int userId, int alternateAckSource) {
-		eventDAO.ackAllPending(time, userId, alternateAckSource);
+		MangoEvent eventService = new EventService();
+		UserService userEvent = new UserService();
+		User user = userEvent.getUser(userId);
+		for (EventInstance evt : eventService.getPendingEvents(user.getId())) {
+			if(!evt.isActive())
+				eventService.ackEvent(evt, time, user, alternateAckSource);
+		}
 	}
 
 	@Override
 	public void silenceAll(int userId) {
-		eventDAO.silenceAll(userId);
+		eventDAO.silenceEvents(userId);
 	}
 
 	@Override
@@ -310,7 +321,7 @@ public EventInstance insertEventComment(int eventId, UserComment comment) {
 	@Override
 	public int purgeEventsBefore(long time) {
 		int result = eventDAO.purgeEventsBefore(time);
-		Common.ctx.getEventManager().resetHighestAlarmLevels();
+		Common.ctx.getEventManager().notifyEventReset();
 		return result;
 	}
 
@@ -424,6 +435,7 @@ public void deleteEventHandler(final String handlerXid) {
 	}
 	
 	@Override
+	@Deprecated(since = "2.8.0")
 	public boolean toggleSilence(int eventId, int userId) {
 		boolean updated = eventDAO.toggleSilence(eventId, userId, false);
 		if (updated) {
@@ -550,6 +562,7 @@ public SQLPageWithTotal<EventDTO> getEventsWithLimit(JsonEventSearch query, User
 		return eventDAO.findEvents(query, user);
 	}
 
+	@Deprecated(since = "2.8.0")
 	private void notifyEventAck(int eventId) {
 		Common.ctx.getEventManager().notifyEventAck(eventId);
   }
@@ -568,6 +581,7 @@ public boolean isXidUnique(String xid, int excludeId) {
 		return DAO.getInstance().isXidUnique(xid, excludeId, "eventHandlers");
 	}
 
+	@Deprecated(since = "2.8.0")
 	private void _ackEvent(int eventId, long time, int userId, int alternateAckSource, boolean signalAlarmLevelChange) {
 		eventDAO.updateAck(time, userId, alternateAckSource, eventId);
 		// true silenced
@@ -576,4 +590,128 @@ private void _ackEvent(int eventId, long time, int userId, int alternateAckSourc
 		clearCache();
 		notifyEventAck(eventId);
 	}
+
+	@Override
+	public boolean toggleSilence(EventInstance event, User user) {
+		boolean updated = eventDAO.toggleSilence(event.getId(), user.getId(), true);
+		if (updated) {
+			Common.ctx.getEventManager().setLastAlarmTimestamp(System.currentTimeMillis());
+			Common.ctx.getEventManager().notifyEventToggle(event, user);
+		} else if(!event.isAssignee()) {
+			Common.ctx.getEventManager().notifyEventRaise(event, user);
+		}
+		return updated;
+	}
+
+	@Transactional(readOnly = false,propagation= Propagation.REQUIRES_NEW,isolation= Isolation.READ_COMMITTED,rollbackFor=SQLException.class)
+	@Override
+	public void ackEvent(EventInstance event, long time, User user, int alternateAckSource, boolean signalAlarmLevelChange) {
+		_ackEvent(event, time, user, alternateAckSource, signalAlarmLevelChange);
+	}
+
+	@Transactional(readOnly = false,propagation= Propagation.REQUIRES_NEW,isolation= Isolation.READ_COMMITTED,rollbackFor=SQLException.class)
+	@Override
+	public void ackEvent(EventInstance event, long time, User user, int alternateAckSource) {
+		_ackEvent(event, time, user, alternateAckSource, true);
+	}
+
+	@Override
+	public boolean assignEvent(EventInstance event, User user) {
+		if(!isAssignPermission(event, user)) {
+			return false;
+		}
+		long time = System.currentTimeMillis();
+		boolean updated = eventDAO.assign(event.getId(), time, user);
+		if (updated) {
+			Common.ctx.getEventManager().setLastAlarmTimestamp(time);
+			Common.ctx.getEventManager().notifyEventAssignee(event);
+			removeUserIdFromCache(user.getId());
+			SystemEventType.raiseEvent(new SystemEventType(SystemEventType.TYPE_ASSIGNED_EVENT), time, false,
+					new LocalizableMessage("events.assignedBy", LoggingUtils.userInfo(user), LoggingUtils.eventInfo(event)));
+		} else {
+			Common.ctx.getEventManager().notifyEventRaise(event);
+		}
+		return updated;
+	}
+
+	@Override
+	public boolean unassignEvent(EventInstance event, User user) {
+		if(!isAssignPermission(event, user)) {
+			return false;
+		}
+		long time = System.currentTimeMillis();
+		boolean updated = eventDAO.unassign(event.getId());
+		if (updated) {
+			Common.ctx.getEventManager().setLastAlarmTimestamp(time);
+			removeUserIdFromCache(user.getId());
+			SystemEventType.raiseEvent(new SystemEventType(SystemEventType.TYPE_UNASSIGNED_EVENT), time, false,
+					new LocalizableMessage("events.unassignedBy", event.getAssigneeUsername(), LoggingUtils.userInfo(user),
+							LoggingUtils.eventInfo(event)));
+		}
+		boolean silence = eventDAO.isSilence(event.getId(), user.getId());
+		if(!silence) {
+			Common.ctx.getEventManager().notifyEventRaise(event);
+		}
+		return updated;
+	}
+
+	@Override
+	public void unassignEvents() {
+		eventDAO.unassignEvents();
+		Common.ctx.getEventManager().notifyEventReset();
+	}
+
+	@Override
+	public void ackEvents(User user) {
+		long now = System.currentTimeMillis();
+		if(user.isAdmin()) {
+			eventDAO.ackEvents(now, user.getId(), 0);
+			clearCache();
+			Common.ctx.getEventManager().notifyEventReset();
+		} else {
+			for (EventInstance evt : getPendingEvents(user.getId())) {
+				if(!evt.isActive())
+					ackEvent(evt, now, user, 0);
+			}
+		}
+	}
+
+	@Override
+	public List<Integer> silenceEvents(User user) {
+		List<Integer> silenced = new ArrayList<>();
+		if(user.isAdmin()) {
+			eventDAO.silenceEvents(user.getId());
+			clearCache();
+			Common.ctx.getEventManager().notifyEventReset();
+		} else {
+			for (EventInstance evt : getPendingEvents(user.getId())) {
+				if (!evt.isSilenced()) {
+					toggleSilence(evt, user);
+					silenced.add(evt.getId());
+				}
+			}
+		}
+		return silenced;
+	}
+
+	private static boolean isAssignPermission(EventInstance event, User user) {
+		return !event.isAssignee() || (user.isAdmin() || Objects.equals(user.getUsername(), event.getAssigneeUsername()));
+	}
+
+	private void notifyEventAck(EventInstance event) {
+		Common.ctx.getEventManager().notifyEventAck(event);
+	}
+
+	private void _ackEvent(EventInstance event, long time, User user, int alternateAckSource, boolean signalAlarmLevelChange) {
+		if(event.isActive()) {
+			LOG.warn("Event is active! This event cannot be acknowledged.");
+			return;
+		}
+		eventDAO.updateAck(time, user.getId(), alternateAckSource, event.getId());
+		// true silenced
+		userEventDAO.updateAck(event.getId(), true);
+
+		clearCache();
+		notifyEventAck(event);
+	}
 }
diff --git a/src/org/scada_lts/mango/service/PendingEventService.java b/src/org/scada_lts/mango/service/PendingEventService.java
index ea9557399e..cecbf8308b 100644
--- a/src/org/scada_lts/mango/service/PendingEventService.java
+++ b/src/org/scada_lts/mango/service/PendingEventService.java
@@ -20,7 +20,6 @@
 
 import com.serotonin.mango.rt.event.type.AlarmLevelType;
 import com.serotonin.mango.rt.event.EventInstance;
-import org.scada_lts.login.ILoggedUsers;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.UserComment;
 import org.apache.commons.logging.Log;
@@ -48,45 +47,44 @@ public class PendingEventService {
 	private final SystemSettingsService systemSettingsService;
 
 	private final IHighestAlarmLevelService highestAlarmLevelService;
-	private final ILoggedUsers loggedUsers;
 
 	public PendingEventService() {
 		userCommentDAO = ApplicationBeans.getUserCommentDaoBean();
 		highestAlarmLevelService = ApplicationBeans.getHighestAlarmLevelServiceBean();
-		loggedUsers = ApplicationBeans.getLoggedUsersBean();
 		pendingEventsDAO = new PendingEventsDAO();
 		systemSettingsService = new SystemSettingsService();
 	}
 
 	public Map<Integer, List<EventInstance>> getPendingEvents() {
-
-		Set<Integer> users = loggedUsers.getUserIds();
-		Map<Integer, List<UserComment>> comments = getCacheUserComments(userCommentDAO.getEventComments());
-		int limit = systemSettingsService.getMiscSettings().getEventPendingLimit();
-
-		Map<Integer,List<EventInstance>> cacheEvents = new ConcurrentHashMap<>();
-		for (int userId: users) {
-			Set<EventInstanceEqualsById> events = pendingEventsDAO.getPendingEvents(userId, comments, AlarmLevelType.NONE,
-							SystemSettingsUtils.getEventPendingUpdateLimit(), 0).stream()
-					.map(EventInstanceEqualsById::new)
-					.collect(Collectors.toSet());
-			if(!events.isEmpty()) {
-				int highestAlarmLevelForUser = highestAlarmLevelService.getAlarmLevel(User.onlyId(userId));
-				for (AlarmLevelType alarmLevelType : AlarmLevelType.getAlarmLevelsWithoutNone()) {
-					if(alarmLevelType.getCode() <= highestAlarmLevelForUser) {
-						long count = events.stream()
-								.filter(a -> a.getEventInstance().getAlarmLevel() >= alarmLevelType.getCode())
-								.count();
-						if (count < limit) {
-							events.addAll(pendingEventsDAO.getPendingEvents(userId, comments, alarmLevelType, limit, 0).stream()
-									.map(EventInstanceEqualsById::new)
-									.collect(Collectors.toSet()));
+		Map<Integer, List<EventInstance>> cacheEvents = new ConcurrentHashMap<>();
+		ApplicationBeans.Lazy.getLoggedUsersBean().ifPresent(loggedUsers -> {
+			Set<Integer> users = loggedUsers.getUserIds();
+			Map<Integer, List<UserComment>> comments = getCacheUserComments(userCommentDAO.getEventComments());
+			int limit = systemSettingsService.getMiscSettings().getEventPendingLimit();
+			for (int userId: users) {
+				Set<EventInstanceEqualsById> events = pendingEventsDAO.getPendingEvents(userId, comments, AlarmLevelType.NONE,
+								SystemSettingsUtils.getEventPendingUpdateLimit(), 0).stream()
+						.map(EventInstanceEqualsById::new)
+						.collect(Collectors.toSet());
+				if(!events.isEmpty()) {
+					int highestAlarmLevelForUser = highestAlarmLevelService.getAlarmLevel(User.onlyId(userId));
+					for (AlarmLevelType alarmLevelType : AlarmLevelType.getAlarmLevelsWithoutNone()) {
+						if(alarmLevelType.getCode() <= highestAlarmLevelForUser) {
+							long count = events.stream()
+									.filter(a -> a.getEventInstance().getAlarmLevel() >= alarmLevelType.getCode())
+									.count();
+							if (count < limit) {
+								events.addAll(pendingEventsDAO.getPendingEvents(userId, comments, alarmLevelType, limit, 0).stream()
+										.map(EventInstanceEqualsById::new)
+										.collect(Collectors.toSet()));
+							}
 						}
 					}
 				}
+				cacheEvents.put(userId, events.stream().map(EventInstanceEqualsById::getEventInstance).collect(Collectors.toList()));
 			}
-			cacheEvents.put(userId, events.stream().map(EventInstanceEqualsById::getEventInstance).collect(Collectors.toList()));
-		}
+		});
+
 		return cacheEvents;
 	}
 
diff --git a/src/org/scada_lts/mango/service/PointValueService.java b/src/org/scada_lts/mango/service/PointValueService.java
index 5caa052eb9..e51ab11529 100644
--- a/src/org/scada_lts/mango/service/PointValueService.java
+++ b/src/org/scada_lts/mango/service/PointValueService.java
@@ -312,7 +312,6 @@ private long savePointValueImpl(int pointId, int dataType, double dvalue, long t
     //TODO rewrite
     private List<PointValueTime> getLstPointValueTime(List<PointValue> lstIn) {
         List<PointValueTime> lst = new ArrayList<PointValueTime>();
-        lstIn.sort(Comparator.comparing(PointValue::getId).reversed());
         for (PointValue pv : lstIn) {
             lst.add(pv.getPointValue());
         }
@@ -546,11 +545,16 @@ static void add(BatchWriteBehindEntry e) {
                 }
             }
         }
+
+        private int instancesSize;
+        private int entriesSize;
+
         public BatchWriteBehind() {}
 
         @Override
         public void work() {
             try {
+                this.instancesSize = instances.size();
                 BatchWriteBehindEntry[] inserts;
                 while (true) {
                     synchronized (ENTRIES) {
@@ -559,6 +563,7 @@ public void work() {
 
                         inserts = new BatchWriteBehindEntry[ENTRIES.size() < MAX_ROWS ? ENTRIES
                                 .size() : MAX_ROWS];
+                        this.entriesSize = inserts.length;
                         ENTRIES.pop(inserts);
                         ENTRIES_MONITOR.setValue(ENTRIES.size());
                     }
@@ -618,7 +623,7 @@ public WorkItemPriority getPriorityType() {
 
         @Override
         public String toString() {
-            return "BatchWriteBehind{instances size: " + instances.size() + '}';
+            return "BatchWriteBehind{current instances size: " + INSTANCES_MONITOR.getValue() + ", current entries size: " + ENTRIES_MONITOR.getValue() + ", instances size: " + this.instancesSize + ", entries size: " + this.entriesSize + '}';
         }
 
         @Override
@@ -681,7 +686,7 @@ public void updateMetaDataPointByScript(User user, String xid) {
 
                 ScriptExecutor scriptExecutor = new ScriptExecutor();
 
-                Map<String, IDataPoint> context = scriptExecutor.convertContext(metaPointLocatorVO.getContext());
+                Map<String, IDataPoint> context = scriptExecutor.convertContext(metaPointLocatorVO.getContext(), dataPointRT, metaDataSourceRT);
 
                 PointValueTime pointValueTime = scriptExecutor.execute(metaPointLocatorVO.getScript(), context, System.currentTimeMillis(), metaPointLocatorVO.getDataTypeId(), System.currentTimeMillis());
                 Common.ctx.getRuntimeManager().setDataPointValue(dataPoint.getId(), pointValueTime, user);
diff --git a/src/org/scada_lts/mango/service/ReportService.java b/src/org/scada_lts/mango/service/ReportService.java
index 076ab695a1..a7437a1c64 100644
--- a/src/org/scada_lts/mango/service/ReportService.java
+++ b/src/org/scada_lts/mango/service/ReportService.java
@@ -132,6 +132,7 @@ public void saveReport(ReportVO report) {
 	}
 
 	@Override
+	@Deprecated(since = "2.8.0")
 	public void deleteReport(int reportId) {
 		reportDAO.delete(reportId);
 	}
@@ -425,4 +426,10 @@ private Object[] appendParameters(Object[] toAppend, Object... params) {
 		System.arraycopy(toAppend, 0, result, params.length, toAppend.length);
 		return result;
 	}
+
+	@Override
+	public void deleteReport(ReportVO report) {
+		ReportJob.unscheduleReportJob(report);
+		reportDAO.delete(report.getId());
+	}
 }
diff --git a/src/org/scada_lts/mango/service/SystemSettingsService.java b/src/org/scada_lts/mango/service/SystemSettingsService.java
index ab3deca0f4..984e17821b 100644
--- a/src/org/scada_lts/mango/service/SystemSettingsService.java
+++ b/src/org/scada_lts/mango/service/SystemSettingsService.java
@@ -8,10 +8,12 @@
 import com.serotonin.mango.rt.event.type.AuditEventType;
 import com.serotonin.mango.rt.event.type.SystemEventType;
 import com.serotonin.mango.rt.maint.DataPurge;
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.bean.PointHistoryCount;
 import com.serotonin.mango.vo.event.EventTypeVO;
 import com.serotonin.mango.web.email.IMsgSubjectContent;
+import com.serotonin.web.dwr.DwrResponseI18n;
 import com.serotonin.web.i18n.I18NUtils;
 import com.serotonin.web.i18n.LocalizableMessage;
 import org.apache.commons.logging.LogFactory;
@@ -22,12 +24,16 @@
 import org.scada_lts.serorepl.utils.DirectoryUtils;
 import org.scada_lts.serorepl.utils.StringUtils;
 import org.scada_lts.utils.SystemSettingsUtils;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.AggregateSettings;
+import org.scada_lts.web.mvc.api.css.CssStyle;
 import org.scada_lts.web.mvc.api.json.*;
+import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.function.Supplier;
 
 import static com.serotonin.mango.util.LoggingUtils.userInfo;
 import static com.serotonin.mango.util.SendUtils.sendMsgTestSync;
@@ -38,6 +44,7 @@
  *
  * @author Radoslaw Jajko
  */
+@Service
 public class SystemSettingsService {
 
     private static final org.apache.commons.logging.Log LOG = LogFactory.getLog(SystemSettingsService.class);
@@ -132,8 +139,8 @@ public JsonSettingsMisc getMiscSettings() {
         JsonSettingsMisc json = new JsonSettingsMisc();
         json.setUiPerformance(SystemSettingsDAO.getIntValue(SystemSettingsDAO.UI_PERFORMANCE));
         json.setDataPointRuntimeValueSynchronized(SystemSettingsDAO.getValue(SystemSettingsDAO.DATAPOINT_RUNTIME_VALUE_SYNCHRONIZED));
-        json.setHideShortcutDisableFullScreen(SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN));
-        json.setEnableFullScreen(SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE));
+        json.setViewHideShortcutDisableFullScreenEnabled(SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN));
+        json.setViewForceFullScreenEnabled(SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE));
         json.setEventPendingLimit(SystemSettingsDAO.getIntValue(SystemSettingsDAO.EVENT_PENDING_LIMIT));
         json.setEventPendingCacheEnabled(SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.EVENT_PENDING_CACHE_ENABLED));
         json.setThreadsNameAdditionalLength(SystemSettingsDAO.getIntValue(SystemSettingsDAO.THREADS_NAME_ADDITIONAL_LENGTH));
@@ -142,22 +149,26 @@ public JsonSettingsMisc getMiscSettings() {
         json.setWorkItemsReportingItemsPerSecondLimit(SystemSettingsDAO.getIntValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT));
         json.setWebResourceGraphicsPath(SystemSettingsDAO.getValue(SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH));
         json.setWebResourceUploadsPath(SystemSettingsDAO.getValue(SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH));
+        json.setEventAssignEnabled(SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.EVENT_ASSIGN_ENABLED));
+        json.setDataPointExtendedNameLengthInReportsLimit(SystemSettingsDAO.getIntValue(SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT));
         return json;
     }
 
     public void saveMiscSettings(JsonSettingsMisc json) {
-        systemSettingsDAO.setIntValue(SystemSettingsDAO.UI_PERFORMANCE, json.getUiPerformance());
-        systemSettingsDAO.setValue(SystemSettingsDAO.DATAPOINT_RUNTIME_VALUE_SYNCHRONIZED, DataPointSyncMode.getName(json.getDataPointRuntimeValueSynchronized()));
-        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN, json.isHideShortcutDisableFullScreen());
-        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE, json.isEnableFullScreen());
-        systemSettingsDAO.setIntValue(SystemSettingsDAO.EVENT_PENDING_LIMIT, json.getEventPendingLimit());
-        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.EVENT_PENDING_CACHE_ENABLED, json.isEventPendingCacheEnabled());
-        systemSettingsDAO.setIntValue(SystemSettingsDAO.THREADS_NAME_ADDITIONAL_LENGTH, json.getThreadsNameAdditionalLength());
-        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ENABLED, json.isWorkItemsReportingEnabled());
-        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_ENABLED, json.isWorkItemsReportingItemsPerSecondEnabled());
-        systemSettingsDAO.setIntValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT, json.getWorkItemsReportingItemsPerSecondLimit());
-        systemSettingsDAO.setValue(SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH, json.getWebResourceGraphicsPath());
-        systemSettingsDAO.setValue(SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH, json.getWebResourceUploadsPath());
+        saveUiPerformanceMisc(json.getUiPerformance());
+        saveDataPointRuntimeValueSynchronizedMisc(json.getDataPointRuntimeValueSynchronized());
+        saveViewHideShortcutDisableFullScreenMisc(json.isViewHideShortcutDisableFullScreenEnabled());
+        saveViewForceFullScreenModeMisc(json.isViewForceFullScreenEnabled());
+        saveEventPendingLimitMisc(json.getEventPendingLimit());
+        saveEventPendingCacheEnabledMisc(json.isEventPendingCacheEnabled());
+        saveThreadsNameAdditionalLengthMisc(json.getThreadsNameAdditionalLength());
+        saveWorkItemsReportingEnabledMisc(json.isWorkItemsReportingEnabled());
+        saveWorkItemsReportingItemsPerSecondEnabledMisc(json.isWorkItemsReportingItemsPerSecondEnabled());
+        saveWorkItemsReportingPerSecondLimitMisc(json.getWorkItemsReportingItemsPerSecondLimit());
+        saveResourceGraphicsPathMisc(json.getWebResourceGraphicsPath());
+        saveResourceUploadsPathMisc(json.getWebResourceUploadsPath());
+        saveDataPointExtendedNameLengthInReportsLimitMisc(json.getDataPointExtendedNameLengthInReportsLimit());
+        saveEventAssignEnabledMisc(json.isEventAssignEnabled());
     }
 
     public SettingsDataRetention getDataRetentionSettings() {
@@ -227,6 +238,8 @@ public JsonSettingsSystemInfo getSystemInfoSettings() {
         json.setNewVersionNotificationLevel(SystemSettingsDAO.getValue(SystemSettingsDAO.NEW_VERSION_NOTIFICATION_LEVEL));
         json.setInstanceDescription(SystemSettingsDAO.getValue(SystemSettingsDAO.INSTANCE_DESCRIPTION));
         json.setLanguage(SystemSettingsDAO.getValue(SystemSettingsDAO.LANGUAGE));
+        json.setTopDescription(SystemSettingsDAO.getValue(SystemSettingsDAO.TOP_DESCRIPTION));
+        json.setTopDescriptionPrefix(SystemSettingsDAO.getValue(SystemSettingsDAO.TOP_DESCRIPTION_PREFIX));
         return json;
     }
 
@@ -234,6 +247,8 @@ public void saveSystemInfoSettings(JsonSettingsSystemInfo json) {
         systemSettingsDAO.setValue(SystemSettingsDAO.NEW_VERSION_NOTIFICATION_LEVEL, json.getNewVersionNotificationLevel());
         systemSettingsDAO.setValue(SystemSettingsDAO.INSTANCE_DESCRIPTION, json.getInstanceDescription());
         systemSettingsDAO.setValue(SystemSettingsDAO.LANGUAGE, json.getLanguage());
+        systemSettingsDAO.setValue(SystemSettingsDAO.TOP_DESCRIPTION, json.getTopDescription());
+        systemSettingsDAO.setValue(SystemSettingsDAO.TOP_DESCRIPTION_PREFIX, json.getTopDescriptionPrefix());
     }
 
     public String getDatabaseType() {
@@ -288,12 +303,13 @@ public Map<String, Object> getDatabaseSize() {
         data.put("historyCount", sum);
         data.put("topPoints", counts);
 
-        MangoEvent eventService = new EventService();
+        MangoEvent eventService = ApplicationBeans.getBean("eventService", MangoEvent.class);
         data.put("eventCount", eventService.getEventCount());
 
         return data;
     }
 
+    @Deprecated(since = "2.8.0")
     public String sendTestEmail(User user) throws Exception {
 
         ResourceBundle bundle = Common.getBundle();
@@ -307,6 +323,20 @@ public String sendTestEmail(User user) throws Exception {
         return "{\"recipient\":\""+user.getEmail()+ "\"}";
     }
 
+    public Map<String, String> sendTestEmailMap(User user) throws Exception {
+
+        ResourceBundle bundle = Common.getBundle();
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("message", new LocalizableMessage("systemSettings.testEmail"));
+        IMsgSubjectContent cnt = IMsgSubjectContent.newInstance(
+                "testEmail", model, bundle, I18NUtils.getMessage(bundle, "ftl.testEmail"), Common.UTF8);
+        sendMsgTestSync(user.getEmail(), cnt, model, () -> "sendTestEmail from: " + this.getClass().getName()
+                + ", " + userInfo(user));
+        Map<String, String> response = new HashMap<>();
+        response.put("recipient", user.getEmail());
+        return response;
+    }
+
     public void purgeAllData() {
         Common.ctx.getRuntimeManager().purgeDataPointValues();
     }
@@ -382,6 +412,14 @@ public void saveAggregateSettings(AggregateSettings aggregateSettings) {
         systemSettingsDAO.setValue(SystemSettingsDAO.AGGREGATION_ENABLED, String.valueOf(aggregateSettings.isEnabled()));
     }
 
+    public void saveEventAssignEnabledMisc(boolean eventAssignEnabled) {
+        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.EVENT_ASSIGN_ENABLED, eventAssignEnabled);
+        if(!eventAssignEnabled) {
+            MangoEvent eventService = ApplicationBeans.getBean("eventService", MangoEvent.class);
+            eventService.unassignEvents();
+        }
+    }
+
     public DataPointSyncMode getDataPointRtValueSynchronized() {
         return SystemSettingsDAO.getObject(SystemSettingsDAO.DATAPOINT_RUNTIME_VALUE_SYNCHRONIZED, DataPointSyncMode::typeOf);
     }
@@ -455,14 +493,24 @@ public int getThreadsNameAdditionalLength() {
         }
     }
 
+    public boolean isEventAssignEnabled() {
+        boolean defaultValue = SystemSettingsUtils.isEventAssignEnabled();
+        try {
+            return SystemSettingsDAO.getBooleanValue(SystemSettingsDAO.EVENT_ASSIGN_ENABLED, defaultValue);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return defaultValue;
+        }
+    }
+
     private static String getHttpResponseHeaders(JsonSettingsHttp json) {
         try {
             String httpResponseHeaders = json.getHttpResponseHeaders();
             if(StringUtils.isEmpty(httpResponseHeaders))
                 return "";
-            ObjectMapper objectMapper = new ObjectMapper();
-            Map<String, String> headers = SystemSettingsUtils.deserializeMap(httpResponseHeaders, objectMapper);
-            return serializeMap(headers, objectMapper);
+            Supplier<ObjectMapper> getObjectMapper = () -> ApplicationBeans.getObjectMapper();
+            Map<String, String> headers = SystemSettingsUtils.deserializeMap(httpResponseHeaders, getObjectMapper);
+            return serializeMap(headers, getObjectMapper);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -470,10 +518,158 @@ private static String getHttpResponseHeaders(JsonSettingsHttp json) {
 
     private static Map<String, String> deserializeMap(String json) {
         try {
-            return SystemSettingsUtils.deserializeMap(json, new ObjectMapper());
+            return SystemSettingsUtils.deserializeMap(json, () -> ApplicationBeans.getObjectMapper());
         } catch (Exception e) {
             LOG.warn(e.getMessage(), e);
             return Collections.emptyMap();
         }
     }
+
+    public CssStyle getCustomCss() {
+        String defaultContent = SystemSettingsUtils.getCustomCssContent();
+        try {
+            String content = SystemSettingsDAO.getValue(SystemSettingsDAO.CUSTOM_CSS_CONTENT);
+            return new CssStyle(content);
+        } catch (Exception ex) {
+            LOG.error(LoggingUtils.exceptionInfo(ex));
+            return new CssStyle(defaultContent);
+        }
+    }
+
+    public void saveCustomCss(CssStyle cssStyle) {
+        systemSettingsDAO.setValue(SystemSettingsDAO.CUSTOM_CSS_CONTENT, cssStyle.getContent());
+    }
+
+    public int getDataPointExtendedNameLengthInReportsLimit() {
+        int defaultValue = SystemSettingsUtils.getDataPointExtendedNameLengthInReportsLimit();
+        try {
+            return SystemSettingsDAO.getIntValue(SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT, defaultValue);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return defaultValue;
+        }
+    }
+    public void saveDataPointExtendedNameLengthInReportsLimitMisc(int dataPointExtendedNameLengthInReportsLimit, DwrResponseI18n response) {
+        if(dataPointExtendedNameLengthInReportsLimit < 4) {
+            response.addContextualMessage(SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT, "validate.invalidValue");
+        } else {
+            saveDataPointExtendedNameLengthInReportsLimitMisc(dataPointExtendedNameLengthInReportsLimit);
+        }
+    }
+
+    public void saveViewHideShortcutDisableFullScreenMisc(boolean viewHideShortcutDisableFullScreen) {
+        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.VIEW_HIDE_SHORTCUT_DISABLE_FULL_SCREEN, viewHideShortcutDisableFullScreen);
+    }
+
+    public void saveViewForceFullScreenModeMisc(boolean viewEnableFullScreen) {
+        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.VIEW_FORCE_FULL_SCREEN_MODE, viewEnableFullScreen);
+    }
+
+    public void saveDataPointRuntimeValueSynchronizedMisc(String dataPointRtValueSynchronized) {
+        systemSettingsDAO.setValue(SystemSettingsDAO.DATAPOINT_RUNTIME_VALUE_SYNCHRONIZED, DataPointSyncMode.getName(dataPointRtValueSynchronized));
+    }
+
+    public void saveEventPendingCacheEnabledMisc(boolean eventPendingCacheEnabled) {
+        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.EVENT_PENDING_CACHE_ENABLED, eventPendingCacheEnabled);
+    }
+
+    public void saveUiPerformanceMisc(int uiPerformance, DwrResponseI18n response) {
+        if(uiPerformance < 0) {
+            response.addContextualMessage(SystemSettingsDAO.UI_PERFORMANCE, "validate.invalidValue");
+        } else {
+            saveUiPerformanceMisc(uiPerformance);
+        }
+    }
+
+    public void saveEventPendingLimitMisc(int eventPendingLimit, DwrResponseI18n response) {
+        if(eventPendingLimit < 0) {
+            response.addContextualMessage(SystemSettingsDAO.EVENT_PENDING_LIMIT, "validate.invalidValue");
+        } else {
+            saveEventPendingLimitMisc(eventPendingLimit);
+        }
+    }
+
+    public void saveThreadsNameAdditionalLengthMisc(int threadsNameAdditionalLength, DwrResponseI18n response) {
+        if(threadsNameAdditionalLength < 0) {
+            response.addContextualMessage(SystemSettingsDAO.THREADS_NAME_ADDITIONAL_LENGTH, "validate.invalidValue");
+        } else {
+            saveThreadsNameAdditionalLengthMisc(threadsNameAdditionalLength);
+        }
+    }
+
+    public void saveWorkItemsReportingMisc(boolean workItemsReportingItemsPerSecondEnabled, int workItemsReportingItemsPerSecondLimit,
+                                           boolean workItemsReportingEnabled, DwrResponseI18n response) {
+        saveWorkItemsReportingEnabledMisc(workItemsReportingEnabled);
+        if(workItemsReportingEnabled) {
+            saveWorkItemsReportingItemsPerSecondEnabledMisc(workItemsReportingItemsPerSecondEnabled);
+            if(workItemsReportingItemsPerSecondEnabled) {
+                if (workItemsReportingItemsPerSecondLimit < 0) {
+                    response.addContextualMessage(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT, "validate.invalidValue");
+                } else {
+                    saveWorkItemsReportingPerSecondLimitMisc(workItemsReportingItemsPerSecondLimit);
+                }
+            } else {
+                saveWorkItemsReportingPerSecondLimitMisc(0);
+            }
+        } else {
+            saveWorkItemsReportingItemsPerSecondEnabledMisc(false);
+            saveWorkItemsReportingPerSecondLimitMisc(0);
+        }
+    }
+
+    public void saveResourceGraphicsPathMisc(String webResourceGraphicsPath, DwrResponseI18n response) {
+        if (webResourceGraphicsPath != null && (StringUtils.isEmpty(webResourceGraphicsPath)
+                || (webResourceGraphicsPath.endsWith("graphics")
+                || webResourceGraphicsPath.endsWith("graphics" + File.separator)))) {
+            saveResourceGraphicsPathMisc(webResourceGraphicsPath);
+        } else {
+            response.addContextualMessage(SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH, "systemsettings.webresource.graphics.path.wrong", File.separator);
+        }
+    }
+
+    public void saveResourceUploadsPathMisc(String webResourceUploadsPath, DwrResponseI18n response) {
+        if (webResourceUploadsPath != null && (StringUtils.isEmpty(webResourceUploadsPath)
+                || (webResourceUploadsPath.endsWith("uploads")
+                || webResourceUploadsPath.endsWith("uploads" + File.separator)))) {
+            saveResourceUploadsPathMisc(webResourceUploadsPath);
+        } else {
+            response.addContextualMessage(SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH, "systemsettings.webresource.uploads.path.wrong", File.separator);
+        }
+    }
+
+    private void saveDataPointExtendedNameLengthInReportsLimitMisc(int dataPointExtendedNameLengthInReportsLimit) {
+        systemSettingsDAO.setIntValue(SystemSettingsDAO.DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT, dataPointExtendedNameLengthInReportsLimit);
+    }
+
+    private void saveUiPerformanceMisc(int uiPerformance) {
+        systemSettingsDAO.setIntValue(SystemSettingsDAO.UI_PERFORMANCE, uiPerformance);
+    }
+
+    private void saveEventPendingLimitMisc(int eventPendingLimit) {
+        systemSettingsDAO.setIntValue(SystemSettingsDAO.EVENT_PENDING_LIMIT, eventPendingLimit);
+    }
+
+    private void saveThreadsNameAdditionalLengthMisc(int threadsNameAdditionalLength) {
+        systemSettingsDAO.setIntValue(SystemSettingsDAO.THREADS_NAME_ADDITIONAL_LENGTH, threadsNameAdditionalLength);
+    }
+
+    private void saveWorkItemsReportingPerSecondLimitMisc(int workItemsReportingItemsPerSecondLimit) {
+        systemSettingsDAO.setIntValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_LIMIT, workItemsReportingItemsPerSecondLimit);
+    }
+
+    private void saveWorkItemsReportingItemsPerSecondEnabledMisc(boolean workItemsReportingItemsPerSecondEnabled) {
+        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ITEMS_PER_SECOND_ENABLED, workItemsReportingItemsPerSecondEnabled);
+    }
+
+    private void saveWorkItemsReportingEnabledMisc(boolean workItemsReportingEnabled) {
+        systemSettingsDAO.setBooleanValue(SystemSettingsDAO.WORK_ITEMS_REPORTING_ENABLED, workItemsReportingEnabled);
+    }
+
+    private void saveResourceGraphicsPathMisc(String webResourceGraphicsPath) {
+        systemSettingsDAO.setValue(SystemSettingsDAO.WEB_RESOURCE_GRAPHICS_PATH, webResourceGraphicsPath);
+    }
+
+    private void saveResourceUploadsPathMisc(String webResourceUploadsPath) {
+        systemSettingsDAO.setValue(SystemSettingsDAO.WEB_RESOURCE_UPLOADS_PATH, webResourceUploadsPath);
+    }
 }
diff --git a/src/org/scada_lts/mango/service/UserCommentService.java b/src/org/scada_lts/mango/service/UserCommentService.java
index 5b359e1782..d30ef858cb 100644
--- a/src/org/scada_lts/mango/service/UserCommentService.java
+++ b/src/org/scada_lts/mango/service/UserCommentService.java
@@ -4,6 +4,8 @@
 import com.serotonin.mango.vo.UserComment;
 import org.scada_lts.dao.IUserCommentDAO;
 
+import java.util.Optional;
+
 /**
  * Service for Comments
  *
@@ -26,6 +28,7 @@ public UserCommentService(IUserCommentDAO userCommentDAO) {
      *
      * @return Result status.
      */
+    @Deprecated(since = "2.8.0")
     public int setUserComment(String comment, int typeComment, int referenceId, User user) {
         UserComment c = new UserComment();
         c.setComment(comment);
@@ -48,4 +51,26 @@ public int setUserComment(String comment, int typeComment, int referenceId, User
     public int deleteUserComment(int userId, int typeComment, int referenceId, long timestamp) {
         return userCommentDAO.deleteUserComment(userId, typeComment, referenceId, timestamp);
     }
+
+    /**
+     * Save user comment to database.
+     *
+     * @param comment String
+     * @param typeComment Type of the comment (Event or Point)
+     * @param referenceId Reference ID of the object (EventID or PointID)
+     *
+     * @return Result Optional<UserComment>.
+     */
+    public Optional<UserComment> addUserComment(String comment, int typeComment, int referenceId, User user) {
+        UserComment c = new UserComment();
+        c.setComment(comment);
+        c.setTs(System.currentTimeMillis());
+        c.setUserId(user.getId());
+        c.setUsername(user.getUsername());
+        c.setTypeKey(referenceId);
+        int result = userCommentDAO.insert(c, typeComment, referenceId);
+        if(result == 0)
+            return Optional.empty();
+        return Optional.of(c);
+    }
 }
diff --git a/src/org/scada_lts/permissions/PermissionEvaluatorAclImp.java b/src/org/scada_lts/permissions/PermissionEvaluatorAclImp.java
index 108eaa60de..09d4ee8356 100644
--- a/src/org/scada_lts/permissions/PermissionEvaluatorAclImp.java
+++ b/src/org/scada_lts/permissions/PermissionEvaluatorAclImp.java
@@ -31,6 +31,7 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.scada_lts.permissions.model.EntryDto;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -115,7 +116,7 @@ public List<EntryDto> filter(long userId, long clazzId ) {
             request.setHeader("Content-type", "application/json");
             HttpResponse response = client.execute(request);
 
-            ObjectMapper mapper = new ObjectMapper();
+            ObjectMapper mapper = ApplicationBeans.getObjectMapper();
             result = mapper.readValue(response.getEntity().getContent(), new TypeReference<List<EntryDto>>() {});
 
             HttpEntity entity = response.getEntity();
diff --git a/src/org/scada_lts/quartz/ResetCacheHighestAlarmLevel.java b/src/org/scada_lts/quartz/ResetCacheHighestAlarmLevel.java
index ae55f27914..64103ee264 100644
--- a/src/org/scada_lts/quartz/ResetCacheHighestAlarmLevel.java
+++ b/src/org/scada_lts/quartz/ResetCacheHighestAlarmLevel.java
@@ -24,7 +24,6 @@
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.quartz.StatefulJob;
-import org.scada_lts.mango.service.UserService;
 import org.scada_lts.service.IHighestAlarmLevelService;
 import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.ws.services.UserEventServiceWebSocket;
@@ -42,18 +41,16 @@ public class ResetCacheHighestAlarmLevel implements StatefulJob {
 
 	private final IHighestAlarmLevelService highestAlarmLevelService;
 	private final UserEventServiceWebSocket userEventServiceWebSocket;
-	private final UserService userService;
 
 	public ResetCacheHighestAlarmLevel() {
 		this.highestAlarmLevelService = ApplicationBeans.getHighestAlarmLevelServiceBean();
-		this.userService = new UserService();
 		this.userEventServiceWebSocket = ApplicationBeans.getUserEventServiceWebsocketBean();
 	}
 
 	@Override
 	public void execute(JobExecutionContext arg0) throws JobExecutionException {
 		long time = System.currentTimeMillis();
-		NotifyEventUtils.resetHighestAlarmLevels(highestAlarmLevelService, userService, userEventServiceWebSocket);
+		NotifyEventUtils.notifyEventReset(highestAlarmLevelService, userEventServiceWebSocket);
 		LOG.info(ResetCacheHighestAlarmLevel.class.getSimpleName() + " executed in [" + (System.currentTimeMillis() - time)+ "] ms");
 	}
 }
diff --git a/src/org/scada_lts/serial/gnu/io/ScadaCommPortIdentifier.java b/src/org/scada_lts/serial/gnu/io/ScadaCommPortIdentifier.java
new file mode 100644
index 0000000000..3876e196ce
--- /dev/null
+++ b/src/org/scada_lts/serial/gnu/io/ScadaCommPortIdentifier.java
@@ -0,0 +1,11 @@
+package org.scada_lts.serial.gnu.io;
+
+
+import java.util.Enumeration;
+
+public class ScadaCommPortIdentifier {
+
+    public static Enumeration getPortIdentifiers() {
+        return gnu.io.CommPortIdentifier.getPortIdentifiers();
+    }
+}
diff --git a/src/org/scada_lts/service/HighestAlarmLevelService.java b/src/org/scada_lts/service/HighestAlarmLevelService.java
index ee3a86459b..0fc8ab55fb 100644
--- a/src/org/scada_lts/service/HighestAlarmLevelService.java
+++ b/src/org/scada_lts/service/HighestAlarmLevelService.java
@@ -4,8 +4,7 @@
 import com.serotonin.mango.vo.User;
 import org.scada_lts.dao.IHighestAlarmLevelDAO;
 import org.scada_lts.dao.model.UserAlarmLevel;
-import org.scada_lts.mango.adapter.MangoUser;
-import org.scada_lts.mango.service.UserService;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.ws.model.WsAlarmLevelMessage;
 
 import java.util.function.BiConsumer;
@@ -13,11 +12,9 @@
 public class HighestAlarmLevelService implements IHighestAlarmLevelService {
 
     private final IHighestAlarmLevelDAO highestAlarmLevelDAO;
-    private final MangoUser userService;
 
     public HighestAlarmLevelService(IHighestAlarmLevelDAO highestAlarmLevelDAO) {
         this.highestAlarmLevelDAO = highestAlarmLevelDAO;
-        this.userService = new UserService();
     }
 
     @Override
@@ -57,8 +54,10 @@ public boolean doRemoveAlarmLevel(User user, EventInstance event, BiConsumer<Use
 
     @Override
     public void doResetAlarmLevels(BiConsumer<User, WsAlarmLevelMessage> send) {
-        for(User user: userService.getActiveUsers())
-            doSend(user, send);
+        ApplicationBeans.Lazy.getLoggedUsersBean().ifPresent(loggedUsers -> {
+            for(User user: loggedUsers.getUsers())
+                doSend(user, send);
+        });
     }
 
     private boolean doSend(User user, BiConsumer<User, WsAlarmLevelMessage> send) {
diff --git a/src/org/scada_lts/service/HighestAlarmLevelServiceWithCache.java b/src/org/scada_lts/service/HighestAlarmLevelServiceWithCache.java
index 577d69a623..6f210d0479 100644
--- a/src/org/scada_lts/service/HighestAlarmLevelServiceWithCache.java
+++ b/src/org/scada_lts/service/HighestAlarmLevelServiceWithCache.java
@@ -12,6 +12,7 @@
 import org.scada_lts.mango.adapter.MangoUser;
 import org.scada_lts.mango.service.UserService;
 import org.scada_lts.quartz.CronTriggerScheduler;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.ws.model.WsAlarmLevelMessage;
 
 import java.util.List;
@@ -111,8 +112,10 @@ public void doResetAlarmLevels(BiConsumer<User, WsAlarmLevelMessage> send) {
         } finally {
             this.lock.writeLock().unlock();
         }
-        for(User user: userService.getActiveUsers())
-            doSend(user, send);
+        ApplicationBeans.Lazy.getLoggedUsersBean().ifPresent(loggedUsers -> {
+            for(User user: loggedUsers.getUsers())
+                doSend(user, send);
+        });
     }
 
     private boolean doSend(User user, BiConsumer<User, WsAlarmLevelMessage> send) {
diff --git a/src/org/scada_lts/service/MultiChangesHistoryService.java b/src/org/scada_lts/service/MultiChangesHistoryService.java
index 014d910a38..891193afaf 100644
--- a/src/org/scada_lts/service/MultiChangesHistoryService.java
+++ b/src/org/scada_lts/service/MultiChangesHistoryService.java
@@ -7,6 +7,7 @@
 import org.scada_lts.dao.model.multichangehistory.MultiChangeHistoryValues;
 import org.scada_lts.service.model.MultiChangeHistoryDTO;
 import org.scada_lts.service.model.ValuesMultiChangesHistoryDTO;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.mvc.api.components.cmp.model.SetValuePointDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,7 +59,7 @@ public Set<MultiChangeHistoryDTO> getHistory(String idViewAndCmpId) {
 
     public void addToCmpHistory(Integer userId, String viewAndCmpId, String interpretedState, SetValuePointDTO[] values) {
 
-        ObjectMapper mapper = new ObjectMapper();
+        ObjectMapper mapper = ApplicationBeans.getObjectMapper();
 
         String json;
         try {
diff --git a/src/org/scada_lts/service/UtilsService.java b/src/org/scada_lts/service/UtilsService.java
index f788beef3b..7eb21129d7 100644
--- a/src/org/scada_lts/service/UtilsService.java
+++ b/src/org/scada_lts/service/UtilsService.java
@@ -33,7 +33,7 @@ public class UtilsService {
 	
 	private static final Log LOG = LogFactory.getLog(UtilsService.class);
 	
-	public Long getTS() {
+	public long getTS() {
 		long ts = System.currentTimeMillis();
 		LOG.info("Get timestamp used REST API ts:"+ts);
 		return ts;
diff --git a/src/org/scada_lts/utils/ApiUtils.java b/src/org/scada_lts/utils/ApiUtils.java
index a20a8577cd..83771e4c5b 100644
--- a/src/org/scada_lts/utils/ApiUtils.java
+++ b/src/org/scada_lts/utils/ApiUtils.java
@@ -115,7 +115,7 @@ public static void setPassword(User userToSave, UserService userService) {
 
     public static UserInfo toUserInfo(User user) {
         JsonSettingsMisc jsonSettingsMisc = new SystemSettingsService().getMiscSettings();
-        return new UserInfo(user, jsonSettingsMisc.isEnableFullScreen(), jsonSettingsMisc.isHideShortcutDisableFullScreen());
+        return new UserInfo(user, jsonSettingsMisc.isViewForceFullScreenEnabled(), jsonSettingsMisc.isViewHideShortcutDisableFullScreenEnabled());
     }
 
     public static <T, R, S> Map<S, R> convertMap(Map<S, List<T>> map, Function<List<T>, R> converter) {
@@ -158,6 +158,15 @@ public static void validateObject(HttpServletRequest request, ScadaValidation to
         }
     }
 
+    public static void validateObjectForCreate(HttpServletRequest request, ScadaValidation toUpdate) {
+        DwrResponseI18n responseI18n = new DwrResponseI18n();
+        toUpdate.validateForCreate(responseI18n);
+        if(responseI18n.getHasMessages()) {
+            throw new BadRequestException(toMapMessages(responseI18n),
+                    request.getRequestURI());
+        }
+    }
+
     public static boolean idExists(Integer id) {
         return id != null && id > 0;
     }
diff --git a/src/org/scada_lts/utils/CreateObjectUtils.java b/src/org/scada_lts/utils/CreateObjectUtils.java
index f9d7a45ac7..e3016d9121 100644
--- a/src/org/scada_lts/utils/CreateObjectUtils.java
+++ b/src/org/scada_lts/utils/CreateObjectUtils.java
@@ -5,6 +5,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.serorepl.utils.StringUtils;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.springframework.util.ClassUtils;
 
 import java.util.ArrayList;
@@ -43,7 +44,7 @@ public static Object[] parseObjects(String valuesAsString, String valueTypesAsSt
             return new Object[0];
         }
         List<Object> objects = new ArrayList<>();
-        ObjectMapper objectMapper = new ObjectMapper();
+        ObjectMapper objectMapper = ApplicationBeans.getObjectMapper();
         for(int i=0; i < valueTypes.length; i++) {
             if(StringUtils.isEmpty(values[i]) || StringUtils.isEmpty(valueTypes[i]))
                 continue;
diff --git a/src/org/scada_lts/utils/EventTypeUtil.java b/src/org/scada_lts/utils/EventTypeUtil.java
index 61e627f136..8ebdd0caf0 100644
--- a/src/org/scada_lts/utils/EventTypeUtil.java
+++ b/src/org/scada_lts/utils/EventTypeUtil.java
@@ -29,6 +29,7 @@
 import com.serotonin.mango.rt.event.type.PublisherEventType;
 import com.serotonin.mango.rt.event.type.ScheduledEventType;
 import com.serotonin.mango.rt.event.type.SystemEventType;
+import com.serotonin.mango.rt.event.type.DataSourcePointEventType;
 
 /** 
  * Deliver type corresponding with mango.
@@ -38,7 +39,7 @@
  */
 public class EventTypeUtil {
 	
-	public static EventType createEventType(int typeId, int typeRef1, int typeRef2)
+	public static EventType createEventType(int typeId, int typeRef1, int typeRef2, int typeRef3)
 			throws SQLException {
 		
 		EventType type;
@@ -58,6 +59,8 @@ public static EventType createEventType(int typeId, int typeRef1, int typeRef2)
 			type = new AuditEventType(typeRef1,typeRef2);
 		} else if (typeId == EventType.EventSources.MAINTENANCE) {
 			type = new MaintenanceEventType(typeRef1);
+		} else if (typeId == EventType.EventSources.DATA_SOURCE_POINT) {
+			type = new DataSourcePointEventType(new DataSourceEventType(typeRef1, typeRef2), typeRef3);
 		} else {
 			throw new ShouldNeverHappenException("Unknown event type: "	+ typeId);
 		}
diff --git a/src/org/scada_lts/utils/MetaDataPointUtils.java b/src/org/scada_lts/utils/MetaDataPointUtils.java
new file mode 100644
index 0000000000..cb0c222341
--- /dev/null
+++ b/src/org/scada_lts/utils/MetaDataPointUtils.java
@@ -0,0 +1,33 @@
+package org.scada_lts.utils;
+
+import com.serotonin.db.IntValuePair;
+import com.serotonin.mango.rt.dataImage.DataPointRT;
+import com.serotonin.mango.rt.dataSource.meta.MetaPointLocatorRT;
+import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
+
+import java.util.Objects;
+
+
+public final class MetaDataPointUtils {
+
+    private MetaDataPointUtils() {}
+
+    public static boolean isDataPointInContext(DataPointRT dataPoint, int dataPointInContextId) {
+        if (isMetaDataPointRT(dataPoint)) {
+            MetaPointLocatorRT metaPointLocatorRT = dataPoint.getPointLocator();
+            if(metaPointLocatorRT != null) {
+                MetaPointLocatorVO metaPointLocatorVO = metaPointLocatorRT.getPointLocatorVO();
+                if(metaPointLocatorVO != null && metaPointLocatorVO.getContext() != null) {
+                    return metaPointLocatorVO.getContext().stream()
+                            .map(IntValuePair::getKey)
+                            .anyMatch(a -> a == dataPointInContextId);
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean isMetaDataPointRT(DataPointRT dataPoint) {
+        return Objects.nonNull(dataPoint) && dataPoint.getPointLocator() instanceof MetaPointLocatorRT;
+    }
+}
diff --git a/src/org/scada_lts/utils/SystemSettingsUtils.java b/src/org/scada_lts/utils/SystemSettingsUtils.java
index 6d92988b67..98d78708ff 100644
--- a/src/org/scada_lts/utils/SystemSettingsUtils.java
+++ b/src/org/scada_lts/utils/SystemSettingsUtils.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import static org.scada_lts.config.ThreadPoolExecutorConfig.getKey;
 import static org.scada_lts.utils.CreateObjectUtils.parseObjects;
@@ -65,6 +66,22 @@ private SystemSettingsUtils() {}
     public static final String HTTP_PROTOCOL_ALLOW_CIRCULAR_REDIRECTS_KEY = "http.protocol.allow-circular-redirects";
     public static final String HTTP_PROTOCOL_TIMEOUT_MS_KEY = "http.protocol.timeout-ms";
 
+    public static final String EVENT_ASSIGN_ENABLED_KEY = "event.assign.enabled";
+
+    private static final String SECURITY_HTTP_QUERY_ACCESS_DENIED_REGEX_KEY = "scadalts.security.http.query.access.denied.regex";
+    private static final String SECURITY_HTTP_QUERY_ACCESS_GRANTED_REGEX_KEY = "scadalts.security.http.query.access.granted.regex";
+    private static final String SECURITY_HTTP_QUERY_LIMIT_KEY = "scadalts.security.http.query.limit";
+    private static final String SECURITY_HTTP_QUERY_PROTECT_ENABLED_KEY = "scadalts.security.http.query.protect.enabled";
+
+    private static final String CUSTOM_CSS_CONTENT_KEY = "systemsettings.custom.css.content";
+
+    private static final String SECURITY_HTTP_BODY_ACCESS_DENIED_REGEX_KEY = "scadalts.security.http.body.access.denied.regex";
+    private static final String SECURITY_HTTP_BODY_ACCESS_GRANTED_REGEX_KEY = "scadalts.security.http.body.access.granted.regex";
+    private static final String SECURITY_HTTP_BODY_PROTECT_ENABLED_KEY = "scadalts.security.http.body.protect.enabled";
+    private static final String DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT_KEY = "systemsettings.reports.data-point-extended-name-length.limit";
+
+    private static final String DATA_TYPE_ALPHANUMERIC_SAVE_VALUE_AS_ESCAPED_KEY = "data-type.alphanumeric.save-value-as-escaped";
+
     private static final org.apache.commons.logging.Log LOG = LogFactory.getLog(SystemSettingsUtils.class);
 
     public static DataPointSyncMode getDataPointSynchronizedMode() {
@@ -95,16 +112,28 @@ public static String getHttpResponseHeaders() {
         }
     }
 
-    public static String serializeMap(Map<String, String> map, ObjectMapper objectMapper) throws JsonProcessingException {
+    @Deprecated(since = "2.8.0")
+    public static String serializeMap1(Map<String, String> map, ObjectMapper objectMapper) throws JsonProcessingException {
         return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);
     }
 
-    public static Map<String, String> deserializeMap(String value, ObjectMapper objectMapper) throws IOException {
+    public static String serializeMap(Map<String, String> map, Supplier<ObjectMapper> getObjectMapper) throws JsonProcessingException {
+        return getObjectMapper.get().writerWithDefaultPrettyPrinter().writeValueAsString(map);
+    }
+
+    @Deprecated(since = "2.8.0")
+    public static Map<String, String> deserializeMap1(String value, ObjectMapper objectMapper) throws IOException {
         if(value == null || "null".equals(value))
             return Collections.emptyMap();
         return objectMapper.readValue(value, new TypeReference<HashMap<String, String>>() {});
     }
 
+    public static Map<String, String> deserializeMap(String value, Supplier<ObjectMapper> getObjectMapper) throws IOException {
+        if(value == null || "null".equals(value))
+            return Collections.emptyMap();
+        return getObjectMapper.get().readValue(value, new TypeReference<HashMap<String, String>>() {});
+    }
+
     public static int getEmailTimeout() {
         try {
             return Integer.parseInt(ScadaConfig.getInstance().getConf().getProperty(EMAIL_TIMEOUT_KEY, "10001"));
@@ -526,4 +555,109 @@ public static int getHttpTimeoutMs() {
             return 15001;
         }
     }
+
+    public static boolean isEventAssignEnabled() {
+        try {
+            String eventAssignEnabled = ScadaConfig.getInstance().getConf().getProperty(EVENT_ASSIGN_ENABLED_KEY, "true");
+            return Boolean.parseBoolean(eventAssignEnabled);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return false;
+        }
+    }
+
+    public static String getSecurityHttpQueryAccessDeniedRegex() {
+        try {
+            return ScadaConfig.getInstance().getConf().getProperty(SECURITY_HTTP_QUERY_ACCESS_DENIED_REGEX_KEY, "");
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return "";
+        }
+    }
+
+    public static String getSecurityHttpQueryAccessGrantedRegex() {
+        try {
+            return ScadaConfig.getInstance().getConf().getProperty(SECURITY_HTTP_QUERY_ACCESS_GRANTED_REGEX_KEY, "");
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return "";
+        }
+    }
+
+    public static int getSecurityHttpQueryLimit() {
+        try {
+            String securityHttpQueryXssLimit = ScadaConfig.getInstance().getConf().getProperty(SECURITY_HTTP_QUERY_LIMIT_KEY, "4001");
+            return Integer.parseInt(securityHttpQueryXssLimit);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return 4002;
+        }
+    }
+
+    public static boolean isSecurityHttpQueryProtectEnabled() {
+        try {
+            String securityHttpQueryXssEnabled = ScadaConfig.getInstance().getConf().getProperty(SECURITY_HTTP_QUERY_PROTECT_ENABLED_KEY, "false");
+            return Boolean.parseBoolean(securityHttpQueryXssEnabled);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return false;
+        }
+    }
+
+    public static String getCustomCssContent() {
+        try {
+            return ScadaConfig.getInstance().getConf().getProperty(CUSTOM_CSS_CONTENT_KEY, "");
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return "";
+        }
+    }
+
+    public static String getSecurityHttpBodyAccessDeniedRegex() {
+        try {
+            return ScadaConfig.getInstance().getConf().getProperty(SECURITY_HTTP_BODY_ACCESS_DENIED_REGEX_KEY, "");
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return "";
+        }
+    }
+
+    public static String getSecurityHttpBodyAccessGrantedRegex() {
+        try {
+            return ScadaConfig.getInstance().getConf().getProperty(SECURITY_HTTP_BODY_ACCESS_GRANTED_REGEX_KEY, "");
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return "";
+        }
+    }
+
+    public static boolean isSecurityHttpBodyProtectEnabled() {
+        try {
+            String securityHttpQueryXssEnabled = ScadaConfig.getInstance().getConf().getProperty(SECURITY_HTTP_BODY_PROTECT_ENABLED_KEY, "false");
+            return Boolean.parseBoolean(securityHttpQueryXssEnabled);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return false;
+        }
+    }
+
+    public static int getDataPointExtendedNameLengthInReportsLimit() {
+        try {
+            String config = ScadaConfig.getInstance().getConf().getProperty(DATA_POINT_EXTENDED_NAME_LENGTH_IN_REPORTS_LIMIT_KEY, "65");
+            return Integer.parseInt(config);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return 66;
+        }
+    }
+
+    public static boolean isDataTypeAlphanumericSaveValueAsEscaped() {
+        try {
+            String dataPointTypeAlphanumericEscaped = ScadaConfig.getInstance().getConf().getProperty(DATA_TYPE_ALPHANUMERIC_SAVE_VALUE_AS_ESCAPED_KEY, "true");
+            return Boolean.parseBoolean(dataPointTypeAlphanumericEscaped);
+        } catch (Exception e) {
+            LOG.error(e.getMessage());
+            return true;
+        }
+    }
 }
diff --git a/src/org/scada_lts/utils/UploadFileUtils.java b/src/org/scada_lts/utils/UploadFileUtils.java
index 3e9e37bb36..65c908a079 100644
--- a/src/org/scada_lts/utils/UploadFileUtils.java
+++ b/src/org/scada_lts/utils/UploadFileUtils.java
@@ -431,7 +431,7 @@ public static String normalizeSeparator(String path) {
     }
 
     private static Path basePath() {
-        String catalinaHome = System.getenv("CATALINA_HOME");
+        String catalinaHome = System.getProperty("catalina.home");
         return Paths.get(catalinaHome);
     }
 
diff --git a/src/org/scada_lts/utils/ValidationDwrUtils.java b/src/org/scada_lts/utils/ValidationDwrUtils.java
new file mode 100644
index 0000000000..0d2e111dc5
--- /dev/null
+++ b/src/org/scada_lts/utils/ValidationDwrUtils.java
@@ -0,0 +1,19 @@
+package org.scada_lts.utils;
+
+public final class ValidationDwrUtils {
+
+    private ValidationDwrUtils() {
+    }
+
+    public static boolean validateVarNameScript(String varName) {
+        char ch = varName.charAt(0);
+        if (!Character.isLetter(ch) && ch != '_')
+            return false;
+        for (int i = 1; i < varName.length(); i++) {
+            ch = varName.charAt(i);
+            if (!Character.isLetterOrDigit(ch) && ch != '_')
+                return false;
+        }
+        return true;
+    }
+}
diff --git a/src/org/scada_lts/utils/ValidationUtils.java b/src/org/scada_lts/utils/ValidationUtils.java
index 9020818eb4..013f76c601 100644
--- a/src/org/scada_lts/utils/ValidationUtils.java
+++ b/src/org/scada_lts/utils/ValidationUtils.java
@@ -1,18 +1,35 @@
 package org.scada_lts.utils;
+import com.serotonin.db.IntValuePair;
 import com.serotonin.mango.Common;
+import com.serotonin.mango.util.LoggingUtils;
+import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
+import com.serotonin.mango.vo.dataSource.PointLocatorVO;
+import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.scada_lts.serorepl.utils.StringUtils;
+import org.scada_lts.svg.SvgUtils;
+import org.scada_lts.utils.security.SafeFile;
 import org.scada_lts.web.mvc.api.exceptions.BadRequestException;
 import org.scada_lts.web.mvc.api.exceptions.UnauthorizedException;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.text.MessageFormat;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
+import static br.org.scadabr.vo.exporter.util.FileUtil.createSvgTempFile;
+
 public final class ValidationUtils {
 
+    private static final Logger LOG = LogManager.getLogger(SafeFile.class);
+
+
     private ValidationUtils() {}
 
     public static String validId(Integer id) {
@@ -41,6 +58,24 @@ public static String validId(Integer id, String xid) {
         return "Correct id or xid;";
     }
 
+    public static String validSvg(String xmlContent) {
+        SafeFile safeFile = null;
+        try {
+            File temp = createSvgTempFile(xmlContent);
+            safeFile = SafeFile.safe(temp);
+            if (SvgUtils.isSvg(safeFile)) {
+                return "";
+            }
+        } catch (Exception ex) {
+            LOG.error(LoggingUtils.exceptionInfo(ex));
+        } finally {
+            if(safeFile != null) {
+                safeFile.delete();
+            }
+        }
+        return "Invalid image";
+    }
+
     static <T> String msgIfNull(String msg, T value) {
         return msgIfNullOrInvalid(msg, value, a -> false);
     }
@@ -99,4 +134,34 @@ public static void checkIfNonAdminThenUnauthorized(HttpServletRequest request) {
             throw new UnauthorizedException(request.getRequestURI());
         }
     }
+
+    public static boolean isCyclicDependency(int starDataPointId, int findDataPointId, Map<Integer, DataPointVO> dataPoints, int safe) {
+        if(starDataPointId == findDataPointId) {
+            return true;
+        }
+        if(safe < 0) {
+            return false;
+        }
+        DataPointVO dataPoint = dataPoints.get(starDataPointId);
+        PointLocatorVO pointLocator = dataPoint.getPointLocator();
+        if(pointLocator instanceof MetaPointLocatorVO) {
+            MetaPointLocatorVO metaPointLocator = (MetaPointLocatorVO) pointLocator;
+            List<IntValuePair> context = metaPointLocator.getContext();
+            if (context == null || context.isEmpty()) {
+                return false;
+            }
+            for (IntValuePair keyValue : context) {
+                int contextDataPointId = keyValue.getKey();
+                DataPointVO contextDataPoint = dataPoints.get(contextDataPointId);
+                if(contextDataPoint.getPointLocator() instanceof MetaPointLocatorVO) {
+                    if (contextDataPointId == findDataPointId) {
+                        return true;
+                    } else {
+                        return isCyclicDependency(contextDataPointId, findDataPointId, dataPoints, --safe);
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/org/scada_lts/utils/XidUtils.java b/src/org/scada_lts/utils/XidUtils.java
index 41456ee841..6b5b6fd1c9 100644
--- a/src/org/scada_lts/utils/XidUtils.java
+++ b/src/org/scada_lts/utils/XidUtils.java
@@ -1,6 +1,5 @@
 package org.scada_lts.utils;
 
-import com.serotonin.mango.vo.event.PointEventDetectorVO;
 import com.serotonin.util.StringUtils;
 import com.serotonin.web.dwr.DwrResponseI18n;
 import com.serotonin.web.i18n.LocalizableMessage;
diff --git a/src/org/scada_lts/utils/security/SafeFile.java b/src/org/scada_lts/utils/security/SafeFile.java
index fcad6a06ba..3fd0d5799e 100644
--- a/src/org/scada_lts/utils/security/SafeFile.java
+++ b/src/org/scada_lts/utils/security/SafeFile.java
@@ -1,13 +1,22 @@
 package org.scada_lts.utils.security;
 
+import com.serotonin.mango.util.LoggingUtils;
+
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import static org.scada_lts.utils.PathSecureUtils.*;
 
 public class SafeFile {
 
+    private static final Logger LOG = LogManager.getLogger(SafeFile.class);
+
     private final File file;
 
     private SafeFile(File file) {
@@ -35,6 +44,15 @@ public Path toPath() {
         return Path.of("");
     }
 
+    public void delete() {
+        try {
+            Files.delete(file.toPath());
+        } catch (IOException e) {
+            LOG.error(LoggingUtils.exceptionInfo(e));
+        }
+        file.delete();
+    }
+
     private boolean validate() {
         String absolutePath = file.getAbsolutePath();
         String path = file.getPath();
diff --git a/src/org/scada_lts/web/beans/ApplicationBeans.java b/src/org/scada_lts/web/beans/ApplicationBeans.java
index 0399e95a1c..8fb00b1e84 100644
--- a/src/org/scada_lts/web/beans/ApplicationBeans.java
+++ b/src/org/scada_lts/web/beans/ApplicationBeans.java
@@ -3,6 +3,7 @@
 import br.org.scadabr.vo.permission.ViewAccess;
 import br.org.scadabr.vo.permission.WatchListAccess;
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.view.View;
@@ -20,7 +21,6 @@
 import org.scada_lts.permissions.service.*;
 import org.scada_lts.service.IHighestAlarmLevelService;
 import org.scada_lts.web.ws.services.DataPointServiceWebSocket;
-import org.scada_lts.web.ws.services.EventsServiceWebSocket;
 import org.scada_lts.web.ws.services.UserEventServiceWebSocket;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
@@ -149,6 +149,10 @@ public static ILoggedUsers getLoggedUsersBean() {
         return getBeanFromContext("loggedUsers", ILoggedUsers.class);
     }
 
+    public static ObjectMapper getObjectMapper() {
+        return getBeanFromContext("objectMapper", ObjectMapper.class);
+    }
+
     public static class Lazy {
 
         private Lazy() {}
@@ -156,6 +160,13 @@ private Lazy() {}
         public static Optional<ILoggedUsers> getLoggedUsersBean() {
             return getBeanFromContext("loggedUsers", ILoggedUsers.class);
         }
+
+        public static Optional<IHighestAlarmLevelService> getHighestAlarmLevelServiceBean() {
+            boolean highestAlarmLevelCacheEnabled = Common.getEnvironmentProfile().getBoolean(HighestAlarmLevelCacheable.CACHE_ENABLED_KEY, true);
+            return highestAlarmLevelCacheEnabled ? getBeanFromContext("highestAlarmLevelServiceWithCache", IHighestAlarmLevelService.class) :
+                    getBeanFromContext("highestAlarmLevelService", IHighestAlarmLevelService.class);
+        }
+
         private static <T> Optional<T> getBeanFromContext(String beanName, Class<T> clazz) {
             try {
                 return Optional.ofNullable(get(beanName, clazz));
diff --git a/src/org/scada_lts/web/beans/serializer/ChronologySerializer.java b/src/org/scada_lts/web/beans/serializer/ChronologySerializer.java
new file mode 100644
index 0000000000..515ad72031
--- /dev/null
+++ b/src/org/scada_lts/web/beans/serializer/ChronologySerializer.java
@@ -0,0 +1,24 @@
+package org.scada_lts.web.beans.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.time.chrono.Chronology;
+
+
+public class ChronologySerializer extends StdSerializer<Chronology> {
+
+    public ChronologySerializer() {
+        super(Chronology.class);
+    }
+
+    @Override
+    public void serialize(Chronology value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        jgen.writeStartObject();
+        jgen.writeStringField("id", value.getId());
+        jgen.writeStringField("calendarType", value.getCalendarType());
+        jgen.writeEndObject();
+    }
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/web/beans/serializer/LocalDateTimeSerializer.java b/src/org/scada_lts/web/beans/serializer/LocalDateTimeSerializer.java
new file mode 100644
index 0000000000..8577f1d091
--- /dev/null
+++ b/src/org/scada_lts/web/beans/serializer/LocalDateTimeSerializer.java
@@ -0,0 +1,33 @@
+package org.scada_lts.web.beans.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+
+
+public class LocalDateTimeSerializer extends StdSerializer<LocalDateTime> {
+
+    public LocalDateTimeSerializer() {
+        super(LocalDateTime.class);
+    }
+
+    @Override
+    public void serialize(LocalDateTime value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        jgen.writeStartObject();
+        jgen.writeNumberField("nano", value.getNano());
+        jgen.writeNumberField("year", value.getYear());
+        jgen.writeNumberField("monthValue", value.getMonthValue());
+        jgen.writeNumberField("dayOfMonth", value.getDayOfMonth());
+        jgen.writeNumberField("hour", value.getHour());
+        jgen.writeNumberField("minute", value.getMinute());
+        jgen.writeNumberField("second", value.getSecond());
+        jgen.writeStringField("month", value.getMonth().name());
+        jgen.writeStringField("dayOfWeek", value.getDayOfWeek().name());
+        jgen.writeNumberField("dayOfYear", value.getDayOfYear());
+        jgen.writeObjectField("chronology", value.getChronology());
+        jgen.writeEndObject();
+    }
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/web/beans/validation/AbstractConstraintValidator.java b/src/org/scada_lts/web/beans/validation/AbstractConstraintValidator.java
new file mode 100644
index 0000000000..798349cd0f
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/AbstractConstraintValidator.java
@@ -0,0 +1,47 @@
+package org.scada_lts.web.beans.validation;
+
+
+import com.serotonin.mango.util.LoggingUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.lang.annotation.Annotation;
+
+
+public abstract class AbstractConstraintValidator<A extends Annotation, T> implements ConstraintValidator<A, T> {
+
+    private static final Logger LOG = LogManager.getLogger(AbstractConstraintValidator.class);
+
+    @Override
+    public void initialize(A constraintAnnotation) {
+    }
+
+    @Override
+    public final boolean isValid(T value, ConstraintValidatorContext context) {
+        try {
+            beforeValidate(value);
+        } catch (Exception e) {
+            LOG.warn("ConstraintValidator: {}", LoggingUtils.causeInfo(e));
+            addErrors(context, LoggingUtils.causeInfo(e));
+            return false;
+        }
+        try {
+            validate(value);
+            return true;
+        } catch (Exception e) {
+            LOG.warn("ConstraintValidator: {}", LoggingUtils.causeInfo(e));
+            addErrors(context, LoggingUtils.causeInfo(e));
+            return false;
+        }
+    }
+
+    public void beforeValidate(T value) throws Exception {}
+    public abstract void validate(T value) throws Exception;
+
+    private static void addErrors(ConstraintValidatorContext context, String msg) {
+        context.disableDefaultConstraintViolation();
+        context.buildConstraintViolationWithTemplate("Unexpected error: " + msg).addConstraintViolation();
+    }
+}
diff --git a/src/org/scada_lts/web/beans/validation/ScadaValidator.java b/src/org/scada_lts/web/beans/validation/ScadaValidator.java
new file mode 100644
index 0000000000..d9e40966d7
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/ScadaValidator.java
@@ -0,0 +1,7 @@
+package org.scada_lts.web.beans.validation;
+
+public interface ScadaValidator<T> {
+
+    void validate(T object) throws ScadaValidatorException;
+
+}
diff --git a/src/org/scada_lts/web/beans/validation/ScadaValidatorException.java b/src/org/scada_lts/web/beans/validation/ScadaValidatorException.java
new file mode 100644
index 0000000000..0e7fde1f66
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/ScadaValidatorException.java
@@ -0,0 +1,23 @@
+package org.scada_lts.web.beans.validation;
+
+public class ScadaValidatorException extends Exception {
+
+    public ScadaValidatorException() {
+    }
+
+    public ScadaValidatorException(String message) {
+        super(message);
+    }
+
+    public ScadaValidatorException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ScadaValidatorException(Throwable cause) {
+        super(cause);
+    }
+
+    public ScadaValidatorException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/src/org/scada_lts/web/beans/validation/css/CssConstraintValidator.java b/src/org/scada_lts/web/beans/validation/css/CssConstraintValidator.java
new file mode 100644
index 0000000000..eed5566eab
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/css/CssConstraintValidator.java
@@ -0,0 +1,22 @@
+package org.scada_lts.web.beans.validation.css;
+
+import org.scada_lts.serorepl.utils.StringUtils;
+import org.scada_lts.web.beans.validation.AbstractConstraintValidator;
+import org.scada_lts.web.beans.validation.ScadaValidator;
+
+
+public class CssConstraintValidator extends AbstractConstraintValidator<CssValid, String> {
+
+    @Override
+    public void beforeValidate(String value) throws Exception {
+        if(StringUtils.isEmpty(value)) {
+            throw new CssValidatorException("Empty");
+        }
+    }
+
+    @Override
+    public void validate(String value) throws Exception {
+        ScadaValidator<String> validator = new SacCssValidator();
+        validator.validate(value);
+    }
+}
diff --git a/src/org/scada_lts/web/beans/validation/css/CssValid.java b/src/org/scada_lts/web/beans/validation/css/CssValid.java
new file mode 100644
index 0000000000..5abb9bd8a9
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/css/CssValid.java
@@ -0,0 +1,16 @@
+package org.scada_lts.web.beans.validation.css;
+
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+@Documented
+@Constraint(validatedBy = CssConstraintValidator.class)
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface CssValid {
+    String message() default "Wrong Css format detected";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}
diff --git a/src/org/scada_lts/web/beans/validation/css/CssValidatorException.java b/src/org/scada_lts/web/beans/validation/css/CssValidatorException.java
new file mode 100644
index 0000000000..f1d8943a93
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/css/CssValidatorException.java
@@ -0,0 +1,25 @@
+package org.scada_lts.web.beans.validation.css;
+
+import org.scada_lts.web.beans.validation.ScadaValidatorException;
+
+public class CssValidatorException extends ScadaValidatorException {
+
+    public CssValidatorException() {
+    }
+
+    public CssValidatorException(String message) {
+        super(message);
+    }
+
+    public CssValidatorException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public CssValidatorException(Throwable cause) {
+        super(cause);
+    }
+
+    public CssValidatorException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/src/org/scada_lts/web/beans/validation/css/SacCssValidator.java b/src/org/scada_lts/web/beans/validation/css/SacCssValidator.java
new file mode 100644
index 0000000000..f7c31f79d1
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/css/SacCssValidator.java
@@ -0,0 +1,54 @@
+package org.scada_lts.web.beans.validation.css;
+
+import com.steadystate.css.parser.SACParserCSS3;
+import org.scada_lts.web.beans.validation.ScadaValidator;
+import org.w3c.css.sac.*;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+public final class SacCssValidator implements ScadaValidator<String> {
+
+    private final Parser parser;
+
+    public SacCssValidator() {
+        this.parser = createParser();
+    }
+
+    @Override
+    public void validate(String style) throws CssValidatorException {
+        try {
+            validateStyle(parser, style);
+        } catch (Exception e) {
+            throw new CssValidatorException(e.getMessage(), e);
+        }
+    }
+
+    private static void validateStyle(Parser parser, String value) throws CSSParseException, IOException {
+        try (StringReader stringReader = new StringReader(value)) {
+            InputSource inputSource = new InputSource(stringReader);
+            parser.parseStyleSheet(inputSource);
+        }
+    }
+
+    private static Parser createParser() {
+        Parser parser = new SACParserCSS3();
+        parser.setErrorHandler(new ErrorHandler() {
+            @Override
+            public void warning(CSSParseException e) throws CSSException {
+                throw e;
+            }
+
+            @Override
+            public void error(CSSParseException e) throws CSSException {
+                throw e;
+            }
+
+            @Override
+            public void fatalError(CSSParseException e) throws CSSException {
+                throw e;
+            }
+        });
+        return parser;
+    }
+}
diff --git a/src/org/scada_lts/web/beans/validation/xss/XssConstraintValidator.java b/src/org/scada_lts/web/beans/validation/xss/XssConstraintValidator.java
new file mode 100644
index 0000000000..924b325892
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/xss/XssConstraintValidator.java
@@ -0,0 +1,13 @@
+package org.scada_lts.web.beans.validation.xss;
+
+import org.scada_lts.web.beans.validation.AbstractConstraintValidator;
+import org.scada_lts.web.beans.validation.ScadaValidator;
+
+public class XssConstraintValidator extends AbstractConstraintValidator<XssProtect, String> {
+
+    @Override
+    public void validate(String value) throws Exception {
+        ScadaValidator<String> validator = new XssValidator();
+        validator.validate(value);
+    }
+}
diff --git a/src/org/scada_lts/web/beans/validation/xss/XssProtect.java b/src/org/scada_lts/web/beans/validation/xss/XssProtect.java
new file mode 100644
index 0000000000..c56362c599
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/xss/XssProtect.java
@@ -0,0 +1,15 @@
+package org.scada_lts.web.beans.validation.xss;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+@Documented
+@Constraint(validatedBy = XssConstraintValidator.class)
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface XssProtect {
+    String message() default "Potential XSS detected in the request body.";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}
diff --git a/src/org/scada_lts/web/beans/validation/xss/XssValidator.java b/src/org/scada_lts/web/beans/validation/xss/XssValidator.java
new file mode 100644
index 0000000000..fafc800b9d
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/xss/XssValidator.java
@@ -0,0 +1,15 @@
+package org.scada_lts.web.beans.validation.xss;
+
+import org.scada_lts.web.beans.validation.ScadaValidator;
+
+import static org.scada_lts.web.security.XssValidatorUtils.validateHttpBody;
+
+public class XssValidator implements ScadaValidator<String> {
+
+    @Override
+    public void validate(String input) throws XssValidatorException {
+        if(!validateHttpBody(input)) {
+            throw new XssValidatorException("Potential XSS attack detected");
+        }
+    }
+}
diff --git a/src/org/scada_lts/web/beans/validation/xss/XssValidatorException.java b/src/org/scada_lts/web/beans/validation/xss/XssValidatorException.java
new file mode 100644
index 0000000000..e7cf8a61d9
--- /dev/null
+++ b/src/org/scada_lts/web/beans/validation/xss/XssValidatorException.java
@@ -0,0 +1,25 @@
+package org.scada_lts.web.beans.validation.xss;
+
+import org.scada_lts.web.beans.validation.ScadaValidatorException;
+
+public class XssValidatorException extends ScadaValidatorException {
+
+    public XssValidatorException() {
+    }
+
+    public XssValidatorException(String message) {
+        super(message);
+    }
+
+    public XssValidatorException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public XssValidatorException(Throwable cause) {
+        super(cause);
+    }
+
+    public XssValidatorException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/src/org/scada_lts/web/content/SnippetContentGenerator.java b/src/org/scada_lts/web/content/SnippetContentGenerator.java
new file mode 100644
index 0000000000..950ba6a096
--- /dev/null
+++ b/src/org/scada_lts/web/content/SnippetContentGenerator.java
@@ -0,0 +1,113 @@
+package org.scada_lts.web.content;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.MissingResourceException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+public class SnippetContentGenerator {
+    private final HttpServletRequest request;
+    private final String contentJsp;
+    private final Map<String, Object> model;
+
+    public SnippetContentGenerator(HttpServletRequest request, String contentJsp, Map<String, Object> model) {
+        this.request = request;
+        this.contentJsp = contentJsp;
+        this.model = model;
+    }
+
+    public String generateContent() throws ServletException, IOException {
+        return generateContent(this.request, this.contentJsp, this.model);
+    }
+
+    public static String generateContent(HttpServletRequest request, String contentJsp, Map<String, Object> model) throws ServletException, IOException {
+        SnippetServletResponse response = new SnippetServletResponse();
+        response.setCharacterEncoding(request.getCharacterEncoding());
+        response.setLocale(request.getLocale());
+        response.setContentType(request.getContentType());
+        Map<String, Object> oldValues = new HashMap();
+        Iterator i$;
+        String key;
+        if (model != null) {
+            for(i$ = model.keySet().iterator(); i$.hasNext(); request.setAttribute(key, model.get(key))) {
+                key = (String)i$.next();
+                Object oldValue = request.getAttribute(key);
+                if (oldValue != null) {
+                    oldValues.put(key, oldValue);
+                }
+            }
+        }
+
+        boolean var14 = false;
+
+        label199: {
+            try {
+                var14 = true;
+                request.getRequestDispatcher(contentJsp).forward(request, response);
+                var14 = false;
+                break label199;
+            } catch (MissingResourceException var15) {
+                key = "Resource " + contentJsp + " not found";
+                var14 = false;
+            } finally {
+                if (var14) {
+                    if (model != null) {
+                        Iterator i = model.keySet().iterator();
+
+                        while(i.hasNext()) {
+                            key = (String)i.next();
+                            request.removeAttribute(key);
+                        }
+
+                        i = oldValues.keySet().iterator();
+
+                        while(i.hasNext()) {
+                            key = (String)i.next();
+                            request.setAttribute(key, oldValues.get(key));
+                        }
+                    }
+
+                }
+            }
+
+            if (model != null) {
+                Iterator i = model.keySet().iterator();
+
+                while(i.hasNext()) {
+                    key = (String)i.next();
+                    request.removeAttribute(key);
+                }
+
+                i = oldValues.keySet().iterator();
+
+                while(i.hasNext()) {
+                    key = (String)i.next();
+                    request.setAttribute(key, oldValues.get(key));
+                }
+            }
+
+            return key;
+        }
+
+        if (model != null) {
+            Iterator i = model.keySet().iterator();
+
+            while(i.hasNext()) {
+                key = (String)i.next();
+                request.removeAttribute(key);
+            }
+
+            i = oldValues.keySet().iterator();
+
+            while(i.hasNext()) {
+                key = (String)i.next();
+                request.setAttribute(key, oldValues.get(key));
+            }
+        }
+
+        return response.getContent();
+    }
+}
diff --git a/src/org/scada_lts/web/content/SnippetServletResponse.java b/src/org/scada_lts/web/content/SnippetServletResponse.java
new file mode 100644
index 0000000000..d28d858c71
--- /dev/null
+++ b/src/org/scada_lts/web/content/SnippetServletResponse.java
@@ -0,0 +1,205 @@
+package org.scada_lts.web.content;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.Locale;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
+public class SnippetServletResponse implements HttpServletResponse {
+    private final StringWriter writer = new StringWriter();
+    private String characterEncoding;
+    private Locale locale;
+    private String contentType;
+
+    public SnippetServletResponse() {}
+
+    public PrintWriter getWriter() {
+        return new PrintWriter(this.writer);
+    }
+
+    public String getContent() {
+        return this.writer.toString();
+    }
+
+    @Override
+    public Locale getLocale() {
+        return locale;
+    }
+
+    @Override
+    public void setLocale(Locale locale) {
+        this.locale = locale;
+    }
+
+    @Override
+    public String getContentType() {
+        return contentType;
+    }
+
+    @Override
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+
+    @Override
+    public String getCharacterEncoding() {
+        return this.characterEncoding;
+    }
+
+    @Override
+    public void setCharacterEncoding(String charEncoding) {
+        this.characterEncoding = charEncoding;
+    }
+
+    @Override
+    public int getBufferSize() {
+        return -1;
+    }
+
+    @Override
+    public void setBufferSize(int size) {
+    }
+
+    public ServletOutputStream getOutputStream() {
+        return new ServletOutputStream() {
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public void setWriteListener(WriteListener writeListener) {
+
+            }
+
+            @Override
+            public void write(int b) throws IOException {
+
+            }
+        };
+    }
+
+    @Override
+    public boolean isCommitted() {
+        return false;
+    }
+
+    @Override
+    public void resetBuffer() {
+    }
+
+    @Override
+    public void reset() {
+    }
+
+    @Override
+    public void setContentLength(int length) {
+    }
+
+    @Override
+    public void flushBuffer() {
+    }
+
+    @Override
+    public void sendError(int status) {
+    }
+
+    @Override
+    public String encodeURL(String url) {
+        return null;
+    }
+
+    @Override
+    public String encodeRedirectURL(String url) {
+        return null;
+    }
+
+    @Override
+    public void addCookie(Cookie cookie) {
+    }
+
+    @Override
+    public String encodeUrl(String url) {
+        return null;
+    }
+
+    @Override
+    public void sendRedirect(String location) {
+    }
+
+    @Override
+    public void addDateHeader(String name, long value) {
+    }
+
+    @Override
+    public void setIntHeader(String name, int value) {
+    }
+
+    @Override
+    public String encodeRedirectUrl(String url) {
+        return null;
+    }
+
+    @Override
+    public void setStatus(int status) {
+    }
+
+    @Override
+    public void addHeader(String name, String value) {
+    }
+
+    @Override
+    public boolean containsHeader(String name) {
+        return false;
+    }
+
+    @Override
+    public void sendError(int status, String message) {
+    }
+
+    @Override
+    public void addIntHeader(String name, int value) {
+    }
+
+    @Override
+    public void setDateHeader(String name, long value) {
+    }
+
+    @Override
+    public void setHeader(String name, String value) {
+    }
+
+    @Override
+    public void setStatus(int status, String message) {
+    }
+
+    @Override
+    public int getStatus() {
+        return 0;
+    }
+
+    @Override
+    public String getHeader(String s) {
+        return null;
+    }
+
+    @Override
+    public Collection<String> getHeaders(String s) {
+        return null;
+    }
+
+    @Override
+    public Collection<String> getHeaderNames() {
+        return null;
+    }
+
+    @Override
+    public void setContentLengthLong(long l) {
+
+    }
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/web/mvc/api/AuthenticationAPI.java b/src/org/scada_lts/web/mvc/api/AuthenticationAPI.java
index 951d57dc61..3266686c00 100644
--- a/src/org/scada_lts/web/mvc/api/AuthenticationAPI.java
+++ b/src/org/scada_lts/web/mvc/api/AuthenticationAPI.java
@@ -17,8 +17,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 
@@ -37,11 +35,12 @@ public class AuthenticationAPI {
 	
 	private static final Log LOG = LogFactory.getLog(AuthenticationAPI.class);
 	
-	private final UserService userService = new UserService();
+	private final UserService userService;
 
 	private final AuthenticationManager authenticationManager;
 
-	public AuthenticationAPI(AuthenticationManager authenticationManager) {
+	public AuthenticationAPI(UserService userService, AuthenticationManager authenticationManager) {
+		this.userService = userService;
 		this.authenticationManager = authenticationManager;
 	}
 	
@@ -72,16 +71,7 @@ public ResponseEntity<String> checkIsLogged(@PathVariable("username") String use
 		} else {
 			ok = false;
 		}
-		
-		ObjectMapper mapper = new ObjectMapper();
-		String json = null;
-		try {
-			json = mapper.writeValueAsString(ok);
-		} catch (JsonProcessingException e) {
-			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-		}
-		return new ResponseEntity<String>(json,HttpStatus.OK);
+		return new ResponseEntity<>(String.valueOf(ok),HttpStatus.OK);
 	}
 	
 	@RequestMapping(value = "/api/auth/logout/{username}", method = RequestMethod.GET)
@@ -93,15 +83,7 @@ public ResponseEntity<String> setLogout(@PathVariable("username") String usernam
 			logout(request);
 		}
 
-		ObjectMapper mapper = new ObjectMapper();
-		String json = null;
-		try {
-			json = mapper.writeValueAsString(true);
-		} catch (JsonProcessingException e) {
-			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-		}
-		return new ResponseEntity<String>(json, HttpStatus.OK);
+		return new ResponseEntity<>(String.valueOf(true),HttpStatus.OK);
 	}
 
 	@RequestMapping(value = "/api/auth/isRoleAdmin", method = RequestMethod.GET)
@@ -111,15 +93,7 @@ public ResponseEntity<String> isRoleAdmin(HttpServletRequest request) {
 		User user = Common.getUser(request);
 		
 		if (user != null) {
-			ObjectMapper mapper = new ObjectMapper();
-			String json = null;
-			try {
-				json = mapper.writeValueAsString(user.isAdmin());
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-			}
-			return new ResponseEntity<String>(json,HttpStatus.OK);
+			return new ResponseEntity<>(String.valueOf(user.isAdmin()),HttpStatus.OK);
 		}
 		
 		return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
@@ -133,15 +107,7 @@ public ResponseEntity<String> isRoleUser(HttpServletRequest request) {
 		User user = Common.getUser(request);
 		
 		if (user != null) {
-			ObjectMapper mapper = new ObjectMapper();
-			String json = null;
-			try {
-				json = mapper.writeValueAsString(!user.isAdmin());
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-			}
-			return new ResponseEntity<String>(json,HttpStatus.OK);
+			return new ResponseEntity<>(String.valueOf(!user.isAdmin()),HttpStatus.OK);
 		}
 		
 		return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
diff --git a/src/org/scada_lts/web/mvc/api/ConfigAPI.java b/src/org/scada_lts/web/mvc/api/ConfigAPI.java
index 39e488e41a..4ed61bb810 100644
--- a/src/org/scada_lts/web/mvc/api/ConfigAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ConfigAPI.java
@@ -1,7 +1,5 @@
 package org.scada_lts.web.mvc.api;
 
-import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
@@ -10,12 +8,9 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 
@@ -37,22 +32,16 @@ public ResponseEntity<String> getConfig(HttpServletRequest request) {
 		User user = Common.getUser(request);
 		
 		if (user != null) {
-			ObjectMapper mapper = new ObjectMapper();
-			String json = null;
 			try {
 				boolean disableAlert = ScadaConfig.getInstance().getBoolean(ScadaConfig.REPLACE_ALERT_ON_VIEW, false);
-				json = mapper.writeValueAsString(disableAlert);	
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
-			} catch (IOException e) {
+				return new ResponseEntity<>(String.valueOf(disableAlert),HttpStatus.OK);
+			} catch (Exception e) {
 				LOG.error(e);
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
-			return new ResponseEntity<String>(json,HttpStatus.OK);
 		}
 		
-		return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+		return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 	}
 	
diff --git a/src/org/scada_lts/web/mvc/api/CustomCssAPI.java b/src/org/scada_lts/web/mvc/api/CustomCssAPI.java
index b60854d896..2c063da8e1 100644
--- a/src/org/scada_lts/web/mvc/api/CustomCssAPI.java
+++ b/src/org/scada_lts/web/mvc/api/CustomCssAPI.java
@@ -1,84 +1,71 @@
 package org.scada_lts.web.mvc.api;
 
-import com.serotonin.mango.Common;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.serorepl.utils.StringUtils;
+import org.scada_lts.web.mvc.api.css.CssStyle;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.*;
+import javax.validation.Valid;
 
-@Controller
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.scada_lts.web.mvc.api.css.CustomCssUtils.saveToFile;
+
+@RestController
 @RequestMapping("/api/customcss")
 public class CustomCssAPI {
 
     private static final Log LOG = LogFactory.getLog(CustomCssAPI.class);
-    private static final String CSS_FILENAME = "/assets/user_styles.css";
 
-    private static final String REQ_RESP_ERROR = "Couldn't create a *.css file.";
+    private final SystemSettingsService systemSettingsService;
+
+    public CustomCssAPI(SystemSettingsService systemSettingsService) {
+        this.systemSettingsService = systemSettingsService;
+    }
 
-    @GetMapping("/")
-    public ResponseEntity<String> getCustomCssFile(HttpServletRequest request) {
+    @GetMapping(value = "", produces = {"application/json;charset=UTF-8"})
+    public ResponseEntity<CssStyle> getCustomCss(HttpServletRequest request) {
         LOG.info("GET: /api/customcss");
         try {
-            StringBuilder customCssContent = new StringBuilder();
-            File cssFile = getCustomCssFileFromPath();
-
-            if(cssFile != null) {
-                BufferedReader reader = new BufferedReader(new FileReader(cssFile.getAbsolutePath()));
-                String currentLine;
-                while ((currentLine = reader.readLine()) != null) {
-                    customCssContent.append(currentLine).append("\n");
-                }
-                return new ResponseEntity<>(customCssContent.toString(), HttpStatus.OK);
-            } else {
-                return new ResponseEntity<>(REQ_RESP_ERROR,HttpStatus.INTERNAL_SERVER_ERROR);
+            CssStyle customCss = systemSettingsService.getCustomCss();
+            if (!StringUtils.isEmpty(customCss.getContent())) {
+                return new ResponseEntity<>(customCss.clearedOfTabs(), HttpStatus.OK);
             }
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         } catch (Exception e) {
             LOG.error(e);
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
-    @PostMapping("/")
-    public ResponseEntity<String> saveCustomCssFile(HttpServletRequest request, @RequestBody String fileContent) {
+    @PostMapping(value = "", consumes = {"application/json;charset=UTF-8"})
+    public ResponseEntity<?> saveCustomCss(HttpServletRequest request, @Valid @RequestBody(required = true) CssStyle cssStyle, BindingResult bindingResult) {
         LOG.info("POST: /api/customcss");
+        if (bindingResult.hasErrors()) {
+            List<String> errors = bindingResult.getFieldErrors().stream()
+                    .map(error -> error.getDefaultMessage())
+                    .collect(Collectors.toList());
+
+            return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST);
+        }
+
         try {
-            File cssFile = getCustomCssFileFromPath();
-            if(cssFile != null) {
-                BufferedWriter writer = new BufferedWriter(new FileWriter(cssFile.getAbsolutePath()));
-                writer.write(fileContent);
-                writer.close();
+            if (!StringUtils.isEmpty(cssStyle.getContent())) {
+                systemSettingsService.saveCustomCss(cssStyle);
+                saveToFile(cssStyle);
                 return new ResponseEntity<>(HttpStatus.OK);
-            } else {
-                return new ResponseEntity<>(REQ_RESP_ERROR, HttpStatus.INTERNAL_SERVER_ERROR);
             }
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         } catch (Exception e) {
             LOG.error(e);
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
-
-    }
-
-    private File getCustomCssFileFromPath() {
-        try {
-            File cssFile = new File(Common.ctx.getCtx().getRealPath(CSS_FILENAME));
-            if(!cssFile.exists()) {
-                boolean created = cssFile.createNewFile();
-                if(created) {
-                    LOG.info("Created custom CSS stylesheet file: " + CSS_FILENAME);
-                }
-            }
-            return cssFile;
-        } catch (IOException e) {
-            LOG.error("Could not create a custom CSS file: " + CSS_FILENAME);
-        }
-        return null;
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/DataPointAPI.java b/src/org/scada_lts/web/mvc/api/DataPointAPI.java
index b027e57e1d..bbbd8b2dc6 100644
--- a/src/org/scada_lts/web/mvc/api/DataPointAPI.java
+++ b/src/org/scada_lts/web/mvc/api/DataPointAPI.java
@@ -29,6 +29,7 @@
 import org.springframework.stereotype.Controller;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
 import java.util.HashMap;
 import java.util.List;
@@ -91,7 +92,7 @@ public ResponseEntity<String> generateUniqueXid(HttpServletRequest request) {
     }
 
     @PostMapping(value = "/api/datapoint")
-    public ResponseEntity<DataPointJson> createDataPoint(@RequestBody(required = false) DataPointJson datapoint,
+    public ResponseEntity<DataPointJson> createDataPoint(@RequestBody(required = false) @Valid DataPointJson datapoint,
                                                          HttpServletRequest request) {
         LOG.debug(request.getRequestURI());
 
@@ -100,7 +101,7 @@ public ResponseEntity<DataPointJson> createDataPoint(@RequestBody(required = fal
     }
 
     @PutMapping(value = "/api/datapoint")
-    public ResponseEntity<DataPointJson> updateDataPoint(@RequestBody(required = false) DataPointJson datapoint,
+    public ResponseEntity<DataPointJson> updateDataPoint(@RequestBody(required = false) @Valid DataPointJson datapoint,
                                                          HttpServletRequest request) {
         LOG.debug(request.getRequestURI());
 
@@ -138,11 +139,11 @@ public ResponseEntity<List<DataPointIdentifier>> searchDataPointIdentifiers(@Req
     }
 
     @GetMapping(value = "/api/datapoint/getConfigurationByXid/{xid}")
-    public ResponseEntity<String> getConfigurationByXid(@PathVariable(required = false) String xid,
+    public ResponseEntity<Map<String, Object>> getConfigurationByXid(@PathVariable(required = false) String xid,
                                                         HttpServletRequest request) {
         LOG.debug(request.getRequestURI());
 
-        String response = dataPointApiService.getConfigurationByXid(request, xid);
+        Map<String, Object>  response = dataPointApiService.getDataPointByXid(request, xid);
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
diff --git a/src/org/scada_lts/web/mvc/api/DataPointApiService.java b/src/org/scada_lts/web/mvc/api/DataPointApiService.java
index 2a275ac335..c23257fbdd 100644
--- a/src/org/scada_lts/web/mvc/api/DataPointApiService.java
+++ b/src/org/scada_lts/web/mvc/api/DataPointApiService.java
@@ -8,6 +8,7 @@
 import org.scada_lts.mango.service.DataPointService;
 import org.scada_lts.permissions.service.GetDataPointsWithAccess;
 import org.scada_lts.serorepl.utils.StringUtils;
+import org.scada_lts.utils.ApiUtils;
 import org.scada_lts.web.mvc.api.datasources.DataPointJson;
 import org.scada_lts.web.mvc.api.datasources.DataSourcePointJsonFactory;
 import org.scada_lts.web.mvc.api.exceptions.*;
@@ -17,12 +18,12 @@
 import javax.servlet.http.HttpServletRequest;
 
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.scada_lts.permissions.service.GetDataPointsWithAccess.filteringByAccess;
-import static org.scada_lts.utils.ApiUtils.idExists;
-import static org.scada_lts.utils.ApiUtils.validateObject;
+import static org.scada_lts.utils.ApiUtils.*;
 import static org.scada_lts.utils.DataSourcePointApiUtils.toObject;
 import static org.scada_lts.utils.UpdateValueUtils.setIf;
 import static org.scada_lts.utils.ValidationUtils.*;
@@ -65,7 +66,7 @@ public String generateUniqueXid(HttpServletRequest request) {
     public DataPointJson create(HttpServletRequest request, DataPointJson datapoint) {
         checkIfNonAdminThenUnauthorized(request);
         checkArgsIfEmptyThenBadRequest(request, "Data Point cannot be null.", datapoint);
-        DataPointVO fromRequest = toDataPointVO(request, datapoint);
+        DataPointVO fromRequest = toDataPointVO(request, datapoint, ApiUtils::validateObjectForCreate);
         dataSourceApiService.read(request, null, fromRequest.getDataSourceId());
         DataPointJson response;
         try {
@@ -154,6 +155,7 @@ public List<DataPointIdentifier> getIdentifiers(HttpServletRequest request) {
         return response;
     }
 
+    @Deprecated(since = "2.8.0")
     public String getConfigurationByXid(HttpServletRequest request, String xid) {
         checkIfNonAdminThenUnauthorized(request);
         if(StringUtils.isEmpty(xid)) {
@@ -172,6 +174,17 @@ public String getConfigurationByXid(HttpServletRequest request, String xid) {
         return response;
     }
 
+    public Map<String, Object> getDataPointByXid(HttpServletRequest request, String xid) {
+        checkIfNonAdminThenUnauthorized(request);
+        if(StringUtils.isEmpty(xid)) {
+            throw new ScadaApiException(ScadaErrorMessage.builder(HttpStatus.OK)
+                    .detail("Given xid is empty.")
+                    .instance(request.getRequestURI())
+                    .build());
+        }
+        return EmportDwr.exportDataPointBy(xid);
+    }
+
     public DataPointVO getDataPointFromDatabase(HttpServletRequest request, String xid, Integer id) {
         checkArgsIfTwoEmptyThenBadRequest(request, "Data Point id or xid cannot be null.", id, xid);
         User user = Common.getUser(request);
@@ -255,14 +268,15 @@ private static boolean filteringByTypes(Integer[] types, DataPointVO point) {
         return Stream.of(types).anyMatch(type -> point.getPointLocator().getDataTypeId() == type);
     }
 
-    private static DataPointVO toDataPointVO(HttpServletRequest request, DataPointJson datapoint) {
+    private static DataPointVO toDataPointVO(HttpServletRequest request, DataPointJson datapoint,
+                                             BiConsumer<HttpServletRequest, DataPointVO> doValidate) {
         DataPointVO dataPointVO;
         try {
             dataPointVO = datapoint.createDataPointVO();
         } catch (Exception ex) {
             throw new InternalServerErrorException(ex, request.getRequestURI());
         }
-        validateObject(request, dataPointVO);
+        doValidate.accept(request, dataPointVO);
         return dataPointVO;
     }
 
diff --git a/src/org/scada_lts/web/mvc/api/DataSourceAPI.java b/src/org/scada_lts/web/mvc/api/DataSourceAPI.java
index a3a44b69c3..f56c5b9fa0 100644
--- a/src/org/scada_lts/web/mvc/api/DataSourceAPI.java
+++ b/src/org/scada_lts/web/mvc/api/DataSourceAPI.java
@@ -28,6 +28,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -103,7 +104,7 @@ public ResponseEntity<String> generateUniqueXid(HttpServletRequest request) {
     }
 
     @PostMapping(value = "/api/datasource")
-    public ResponseEntity<DataSourceJson> createDataSource(@RequestBody(required = false) DataSourceJson dataSource,
+    public ResponseEntity<DataSourceJson> createDataSource(@RequestBody(required = false) @Valid DataSourceJson dataSource,
                                                            HttpServletRequest request) {
         LOG.debug( request.getRequestURI());
 
@@ -112,7 +113,7 @@ public ResponseEntity<DataSourceJson> createDataSource(@RequestBody(required = f
     }
 
     @PutMapping(value = "/api/datasource")
-    public ResponseEntity<DataSourceJson> updateDataSource(@RequestBody(required = false) DataSourceJson dataSource,
+    public ResponseEntity<DataSourceJson> updateDataSource(@RequestBody(required = false) @Valid DataSourceJson dataSource,
                                                            HttpServletRequest request) {
         LOG.debug( request.getRequestURI());
 
diff --git a/src/org/scada_lts/web/mvc/api/DataSourceApiService.java b/src/org/scada_lts/web/mvc/api/DataSourceApiService.java
index e07acc3bca..0b35087a07 100644
--- a/src/org/scada_lts/web/mvc/api/DataSourceApiService.java
+++ b/src/org/scada_lts/web/mvc/api/DataSourceApiService.java
@@ -5,6 +5,7 @@
 import com.serotonin.mango.vo.dataSource.DataSourceVO;
 import org.scada_lts.dao.model.DataSourceIdentifier;
 import org.scada_lts.mango.service.DataSourceService;
+import org.scada_lts.utils.ApiUtils;
 import org.scada_lts.web.mvc.api.datasources.DataPointJson;
 import org.scada_lts.web.mvc.api.datasources.DataSourceJson;
 import org.scada_lts.web.mvc.api.datasources.DataSourcePointJsonFactory;
@@ -15,10 +16,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
 import static org.scada_lts.utils.ApiUtils.idExists;
-import static org.scada_lts.utils.ApiUtils.validateObject;
 import static org.scada_lts.utils.DataSourcePointApiUtils.toObject;
 import static org.scada_lts.utils.ValidationUtils.*;
 
@@ -59,10 +60,10 @@ public DataSourceJson create(HttpServletRequest request, DataSourceJson dataSour
         checkIfNonAdminThenUnauthorized(request);
         checkArgsIfEmptyThenBadRequest(request, "Data Source cannot be null.", dataSource);
 
-        DataSourceVO<?> vo = toDataSourceVO(request, dataSource);
+        DataSourceVO<?> fromRequest = toDataSourceVO(request, dataSource, ApiUtils::validateObjectForCreate);
         DataSourceJson response;
         try {
-            DataSourceVO<?> created = dataSourceService.createDataSource(vo);
+            DataSourceVO<?> created = dataSourceService.createDataSource(fromRequest);
             response = DataSourcePointJsonFactory.getDataSourceJson(created);
         } catch (Exception ex) {
             throw new InternalServerErrorException(ex, request.getRequestURI());
@@ -75,7 +76,7 @@ public DataSourceJson update(HttpServletRequest request, DataSourceJson dataSour
         checkIfNonAdminThenUnauthorized(request);
         checkArgsIfEmptyThenBadRequest(request, "Data Source cannot be null.", dataSource);
         getDataSourceFromDatabase(request, dataSource.getXid(), dataSource.getId());
-        DataSourceVO<?> fromRequest = toDataSourceVO(request, dataSource);
+        DataSourceVO<?> fromRequest = toDataSourceVO(request, dataSource, ApiUtils::validateObject);
         try {
             dataSourceService.updateAndInitializeDataSource(fromRequest);
         } catch (Exception ex) {
@@ -211,14 +212,15 @@ private DataSourceVO<?> getDataSourceFromDatabase(HttpServletRequest request, St
         return response;
     }
 
-    private static DataSourceVO<?> toDataSourceVO(HttpServletRequest request, DataSourceJson dataSource) {
+    private static DataSourceVO<?> toDataSourceVO(HttpServletRequest request, DataSourceJson dataSource,
+                                                  BiConsumer<HttpServletRequest, DataSourceVO<?>> doValidate) {
         DataSourceVO<?> dataSourceVO;
         try {
             dataSourceVO = dataSource.createDataSourceVO();
         } catch (Exception ex) {
             throw new InternalServerErrorException(ex, request.getRequestURI());
         }
-        validateObject(request, dataSourceVO);
+        doValidate.accept(request, dataSourceVO);
         return dataSourceVO;
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/EventDetectorAPI.java b/src/org/scada_lts/web/mvc/api/EventDetectorAPI.java
index b83ac6aa5d..e80655d8c3 100644
--- a/src/org/scada_lts/web/mvc/api/EventDetectorAPI.java
+++ b/src/org/scada_lts/web/mvc/api/EventDetectorAPI.java
@@ -1,7 +1,5 @@
 package org.scada_lts.web.mvc.api;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
@@ -17,7 +15,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
@@ -38,8 +35,11 @@ public class EventDetectorAPI {
 
     private static final Log LOG = LogFactory.getLog(EventDetectorAPI.class);
 
-    @Resource
-    private DataPointService dataPointService;
+    private final DataPointService dataPointService;
+
+    public EventDetectorAPI(DataPointService dataPointService) {
+        this.dataPointService = dataPointService;
+    }
 
     @GetMapping(value = "/getAll/id/{datapointId}", produces = "application/json")
     public ResponseEntity<List<PointEventDetectorVO>> getEventDetectorsById(@PathVariable int datapointId, HttpServletRequest request) {
@@ -82,7 +82,7 @@ public ResponseEntity<String> updateEventDetector(@PathVariable Integer datapoin
     }
 
     @DeleteMapping(value = "/delete/{datapointId}/{id}", produces = "application/json")
-    public ResponseEntity<String> deleteEventDetectorById(@PathVariable int datapointId, @PathVariable int id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> deleteEventDetectorById(@PathVariable int datapointId, @PathVariable int id, HttpServletRequest request) {
         LOG.info("/api/eventDetector/delete/" + datapointId + "/" + id);
         try {
             User user = Common.getUser(request);
@@ -97,14 +97,7 @@ public ResponseEntity<String> deleteEventDetectorById(@PathVariable int datapoin
                 Common.ctx.getRuntimeManager().saveDataPoint(dataPointVO);
                 Map<String, String> response = new HashMap<>();
                 response.put("status", "deleted");
-                ObjectMapper m = new ObjectMapper();
-                try {
-                    String json = m.writeValueAsString(response);
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.FORBIDDEN);
-                }
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
diff --git a/src/org/scada_lts/web/mvc/api/EventHandlerAPI.java b/src/org/scada_lts/web/mvc/api/EventHandlerAPI.java
index e3e975f9a8..d7ac98ab38 100644
--- a/src/org/scada_lts/web/mvc/api/EventHandlerAPI.java
+++ b/src/org/scada_lts/web/mvc/api/EventHandlerAPI.java
@@ -1,7 +1,5 @@
 package org.scada_lts.web.mvc.api;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.event.EventHandlerVO;
@@ -15,7 +13,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
@@ -27,8 +24,11 @@ public class EventHandlerAPI {
 
     private static final Log LOG = LogFactory.getLog(EventHandlerAPI.class);
 
-    @Resource
-    private EventService eventHandlerService;
+    private final EventService eventHandlerService;
+
+    public EventHandlerAPI(EventService eventHandlerService) {
+        this.eventHandlerService = eventHandlerService;
+    }
 
     @GetMapping(value = "/getAll", produces = "application/json")
     public ResponseEntity<List<EventHandlerVO>> getAllEventHandlers(HttpServletRequest request) {
@@ -152,17 +152,20 @@ public ResponseEntity<EventHandlerVO> createEventHandlerTypeSms(@PathVariable("t
     }
 
     @PutMapping(value = "/update/{typeId}/{typeRef1}/{typeRef2}", consumes = "application/json")
-    public ResponseEntity<String> updateEventHandler(@PathVariable("typeId") int typeId, @PathVariable("typeRef1") int typeRef1, @PathVariable("typeRef2") int typeRef2, @RequestBody EventHandlerVO handler, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> updateEventHandler(@PathVariable("typeId") int typeId, @PathVariable("typeRef1") int typeRef1, @PathVariable("typeRef2") int typeRef2, @RequestBody EventHandlerVO handler, HttpServletRequest request) {
         LOG.info("/api/eventHandler/update/...");
         try {
             User user = Common.getUser(request);
             if (user != null) {
+                Map<String, String> response = new HashMap<>();
                 try {
                     EventTypeVO typeVO = new EventTypeVO(typeId, typeRef1, typeRef2);
                     eventHandlerService.saveEventHandler(typeVO, handler);
-                    return new ResponseEntity<>("{\"status\":\"updated\"}", HttpStatus.OK);
+                    response.put("status", "updated");
+                    return new ResponseEntity<>(response, HttpStatus.OK);
                 } catch (NullPointerException ex) {
-                    return new ResponseEntity<>("{\"status\":\"warning\"}", HttpStatus.OK);
+                    response.put("status", "warning");
+                    return new ResponseEntity<>(response, HttpStatus.OK);
                 }
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -174,7 +177,7 @@ public ResponseEntity<String> updateEventHandler(@PathVariable("typeId") int typ
     }
 
     @DeleteMapping(value = "/delete/{xid}", produces = "application/json")
-    public ResponseEntity<String> deleteEventHandlerByXid(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> deleteEventHandlerByXid(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/eventHandler/delete/" + xid);
         try {
             User user = Common.getUser(request);
@@ -182,14 +185,7 @@ public ResponseEntity<String> deleteEventHandlerByXid(@PathVariable("xid") Strin
                 eventHandlerService.deleteEventHandler(xid);
                 Map<String, String> response = new HashMap<>();
                 response.put("status", "deleted");
-                ObjectMapper m = new ObjectMapper();
-                try {
-                    String json = m.writeValueAsString(response);
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.FORBIDDEN);
-                }
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -200,7 +196,7 @@ public ResponseEntity<String> deleteEventHandlerByXid(@PathVariable("xid") Strin
     }
 
     @DeleteMapping(value = "/delete/id/{id}", produces = "application/json")
-    public ResponseEntity<String> deleteEventHandlerById(@PathVariable("id") int id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> deleteEventHandlerById(@PathVariable("id") int id, HttpServletRequest request) {
         LOG.info("/api/eventHandler/delete/id/" + id);
         try {
             User user = Common.getUser(request);
@@ -208,14 +204,7 @@ public ResponseEntity<String> deleteEventHandlerById(@PathVariable("id") int id,
                 eventHandlerService.deleteEventHandler(id);
                 Map<String, String> response = new HashMap<>();
                 response.put("status", "deleted");
-                ObjectMapper m = new ObjectMapper();
-                try {
-                    String json = m.writeValueAsString(response);
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.FORBIDDEN);
-                }
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
diff --git a/src/org/scada_lts/web/mvc/api/EventsAPI.java b/src/org/scada_lts/web/mvc/api/EventsAPI.java
index d981fac217..43e8e6c92e 100644
--- a/src/org/scada_lts/web/mvc/api/EventsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/EventsAPI.java
@@ -1,6 +1,7 @@
 package org.scada_lts.web.mvc.api;
 
 import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.event.EventInstance;
 import com.serotonin.mango.vo.User;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -83,8 +84,12 @@ public ResponseEntity<String> acknowledgeEvent(@PathVariable("id") int eventId,
         try {
             User user = Common.getUser(request);
             if (user != null) {
+                EventInstance event = eventService.getEvent(eventId);
+                if (event == null) {
+                    return new ResponseEntity<>("Event not found", HttpStatus.NOT_FOUND);
+                }
                 Date time = new Date();
-                eventService.ackEvent(eventId, time.getTime(), user.getId(), 0);
+                eventService.ackEvent(event, time.getTime(), user, 0);
                 return new ResponseEntity<>(HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -107,7 +112,6 @@ public ResponseEntity<String> silenceEvent(@PathVariable("id") int eventId, Http
         try {
             User user = Common.getUser(request);
             if (user != null) {
-                Date time = new Date();
                 eventService.silenceEvent(eventId, user.getId());
                 return new ResponseEntity<>(HttpStatus.OK);
             } else {
@@ -131,7 +135,6 @@ public ResponseEntity<String> unsilenceEvent(@PathVariable("id") int eventId, Ht
         try {
             User user = Common.getUser(request);
             if (user != null) {
-                Date time = new Date();
                 eventService.unsilenceEvent(eventId, user.getId());
                 return new ResponseEntity<>(HttpStatus.OK);
             } else {
@@ -200,8 +203,7 @@ public ResponseEntity<String> acknowledgeAllEvents(HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if (user != null) {
-                Date time = new Date();
-                eventService.ackAllPending(time.getTime(), user.getId(), 0);
+                eventService.ackEvents(user);
                 return new ResponseEntity<>(HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -223,8 +225,7 @@ public ResponseEntity<String> silenceAllEvents(HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if (user != null) {
-                Date time = new Date();
-                eventService.silenceAll(user.getId());
+                eventService.silenceEvents(user);
                 return new ResponseEntity<>(HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -301,7 +302,6 @@ public ResponseEntity<String> unsilenceSelectedEvents(@RequestBody JsonIdSelecti
         try {
             User user = Common.getUser(request);
             if (user != null) {
-                Date time = new Date();
                 List <Integer> ids = new ArrayList<Integer>();
                 for (String id: query.getIds().split(",")) {
                     ids.add(Integer.parseInt(id.trim()));
@@ -330,6 +330,10 @@ public ResponseEntity<List<EventCommentDTO>> getCommentsByEventId(@PathVariable(
         try {
             User user = Common.getUser(request);
             if (user != null) {
+                EventInstance event = eventService.getEvent(eventId);
+                if (event == null) {
+                    return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+                }
                 List<EventCommentDTO> result = eventService.findCommentsByEventId(eventId);
                 return new ResponseEntity<List<EventCommentDTO>>(result, HttpStatus.OK);
             } else {
@@ -339,4 +343,58 @@ public ResponseEntity<List<EventCommentDTO>> getCommentsByEventId(@PathVariable(
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
+
+    /**
+     * Accept specific Event Alarm from REST API
+     *
+     * @param eventId Event ID number
+     * @param request Request containing user data
+     * @return Response
+     */
+    @PutMapping(value = "/assign/{id}")
+    public ResponseEntity<String> assigneeEvent(@PathVariable("id") int eventId, HttpServletRequest request) {
+        LOG.info("PUT::/api/assignee/" + eventId);
+        try {
+            User user = Common.getUser(request);
+            if (user != null) {
+                EventInstance event = eventService.getEvent(eventId);
+                if (event == null) {
+                    return new ResponseEntity<>("Event not found", HttpStatus.NOT_FOUND);
+                }
+                eventService.assignEvent(event, user);
+                return new ResponseEntity<>(HttpStatus.OK);
+            } else {
+                return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+            }
+        } catch (Exception e) {
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * Accept specific Event Alarm from REST API
+     *
+     * @param eventId Event ID number
+     * @param request Request containing user data
+     * @return Response
+     */
+    @PutMapping(value = "/unassign/{id}")
+    public ResponseEntity<String> clearAssigneeEvent(@PathVariable("id") int eventId, HttpServletRequest request) {
+        LOG.info("PUT::/api/clear-assignee/" + eventId);
+        try {
+            User user = Common.getUser(request);
+            if (user != null) {
+                EventInstance event = eventService.getEvent(eventId);
+                if (event == null) {
+                    return new ResponseEntity<>("Event not found", HttpStatus.NOT_FOUND);
+                }
+                eventService.unassignEvent(event, user);
+                return new ResponseEntity<>(HttpStatus.OK);
+            } else {
+                return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+            }
+        } catch (Exception e) {
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
 }
diff --git a/src/org/scada_lts/web/mvc/api/MailingListAPI.java b/src/org/scada_lts/web/mvc/api/MailingListAPI.java
index 14d4e3a204..17dbb53f79 100644
--- a/src/org/scada_lts/web/mvc/api/MailingListAPI.java
+++ b/src/org/scada_lts/web/mvc/api/MailingListAPI.java
@@ -17,11 +17,12 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.scada_lts.utils.ApiUtils.*;
 import static org.scada_lts.utils.MailingListApiUtils.*;
-import static org.scada_lts.utils.ValidationUtils.formatErrorsJson;
 
 /**
  * Controller for MailingList
@@ -126,23 +127,28 @@ public ResponseEntity<String> generateUniqueXid(HttpServletRequest request) {
     }
 
     @PostMapping(value = "/", produces = "application/json")
-    public ResponseEntity<String> createMailingList(@RequestBody CreateMailingList mailingList, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> createMailingList(@RequestBody CreateMailingList mailingList, HttpServletRequest request) {
         LOG.info("POST:/api/mailingList");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateMailingListCreate(mailingList);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 if (isMailingListPresent(mailingList.getXid(), mailingListService)) {
-                    return new ResponseEntity<>(formatErrorsJson("This XID is already in use"), HttpStatus.BAD_REQUEST);
+                    response.put("errors", "This XID is already in use");
+                    return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
                 }
                 if (!usersExist(mailingList.getEntries(), userService)) {
-                    return new ResponseEntity<>(formatErrorsJson("user or users not found"), HttpStatus.NOT_FOUND);
+                    response.put("errors", "user or users not found");
+                    return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
                 }
                 mailingListService.saveMailingList(createMailingListFromBody(mailingList));
-                return new ResponseEntity<>("{\"status\":\"created\"}", HttpStatus.CREATED);
+                response.put("status", "created");
+                return new ResponseEntity<>(response, HttpStatus.CREATED);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -152,14 +158,16 @@ public ResponseEntity<String> createMailingList(@RequestBody CreateMailingList m
     }
 
     @PutMapping(value = "/", produces = "application/json")
-    public ResponseEntity<String> updateMailingList(@RequestBody UpdateMailingList mailingList, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> updateMailingList(@RequestBody UpdateMailingList mailingList, HttpServletRequest request) {
         LOG.info("PUT:/api/mailingList");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateMailingListUpdate(mailingList);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 return findAndUpdateMailingList(mailingList);
             } else {
@@ -171,17 +179,20 @@ public ResponseEntity<String> updateMailingList(@RequestBody UpdateMailingList m
     }
 
     @DeleteMapping(value = "/{id}", produces = "application/json")
-    public ResponseEntity<String> deleteMailingListById(@PathVariable Integer id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> deleteMailingListById(@PathVariable Integer id, HttpServletRequest request) {
         LOG.info("DELETE: /api/mailingList/{id}");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateMailingListDelete(id);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 mailingListService.deleteMailingList(id);
-                return new ResponseEntity<>("{\"status\":\"deleted\"}", HttpStatus.OK);
+                response.put("status", "deleted");
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -190,22 +201,28 @@ public ResponseEntity<String> deleteMailingListById(@PathVariable Integer id, Ht
         }
     }
 
-    private ResponseEntity<String> findAndUpdateMailingList(UpdateMailingList mailingListBody) {
+    private ResponseEntity<Map<String, String>> findAndUpdateMailingList(UpdateMailingList mailingListBody) {
+        Map<String, String> errors = new HashMap<>();
+        errors.put("errors", "mailingList not found");
         return getMailingList(mailingListBody.getId(), mailingListService)
                 .map(toUpdate -> updateMailingList(toUpdate, mailingListBody)).
-                        orElse(new ResponseEntity<>(formatErrorsJson("mailingList not found"), HttpStatus.NOT_FOUND));
+                        orElse(new ResponseEntity<>(errors, HttpStatus.NOT_FOUND));
     }
 
-    private ResponseEntity<String> updateMailingList(MailingList toUpdate, UpdateMailingList mailingListBody) {
+    private ResponseEntity<Map<String, String>> updateMailingList(MailingList toUpdate, UpdateMailingList mailingListBody) {
+        Map<String, String> response = new HashMap<>();
         if (mailingListBody.getEntries() != null && !usersExist(mailingListBody.getEntries(), userService)) {
-            return new ResponseEntity<>(formatErrorsJson("user or users not found"), HttpStatus.NOT_FOUND);
+            response.put("errors", "user or users not found");
+            return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
         }
         if (isXidChanged(toUpdate.getXid(), mailingListBody.getXid()) &&
-                isMailingListPresent(mailingListBody.getXid(), mailingListService)){
-            return new ResponseEntity<>(formatErrorsJson("This XID is already in use"), HttpStatus.BAD_REQUEST);
+                isMailingListPresent(mailingListBody.getXid(), mailingListService)) {
+            response.put("errors", "This XID is already in use");
+            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
         }
         updateValueMailingList(toUpdate, mailingListBody);
         mailingListService.saveMailingList(toUpdate);
-        return new ResponseEntity<>("{\"status\":\"updated\"}", HttpStatus.OK);
+        response.put("status", "updated");
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/PointHierarchyAPI.java b/src/org/scada_lts/web/mvc/api/PointHierarchyAPI.java
index 3f250e240a..135d8c2194 100644
--- a/src/org/scada_lts/web/mvc/api/PointHierarchyAPI.java
+++ b/src/org/scada_lts/web/mvc/api/PointHierarchyAPI.java
@@ -32,7 +32,9 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Create by at Grzesiek Bylica
@@ -217,20 +219,21 @@ public ResponseEntity<String> deleteFolder(
     }
 
     @RequestMapping(value = "/api/pointHierarchy/cacheRefresh", method = RequestMethod.POST)
-    public ResponseEntity<String> cacheRefresh(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> cacheRefresh(HttpServletRequest request) {
         LOG.info("/api/pointHierarchy/cacheRefresh");
-        ResponseEntity<String> result = null;
+        ResponseEntity<Map<String, String>> result = null;
+        Map<String, String> empty = new HashMap<>();
         try {
             User user = Common.getUser(request);
             if (user.isAdmin()) {
                 pointHierarchyXidService.cacheRefresh();
-                result = new ResponseEntity<>("{}", HttpStatus.OK);
+                result = new ResponseEntity<>(empty, HttpStatus.OK);
             } else {
-                result = new ResponseEntity<>("{}", HttpStatus.UNAUTHORIZED);
+                result = new ResponseEntity<>(empty, HttpStatus.UNAUTHORIZED);
             }
         } catch (Exception e) {
             LOG.error(e);
-            result = new ResponseEntity<>("{}", HttpStatus.BAD_REQUEST);
+            result = new ResponseEntity<>(empty, HttpStatus.BAD_REQUEST);
         }
         return result;
     }
diff --git a/src/org/scada_lts/web/mvc/api/PointPropertiesAPI.java b/src/org/scada_lts/web/mvc/api/PointPropertiesAPI.java
index 917f73c0c2..aa21f13408 100644
--- a/src/org/scada_lts/web/mvc/api/PointPropertiesAPI.java
+++ b/src/org/scada_lts/web/mvc/api/PointPropertiesAPI.java
@@ -2,10 +2,11 @@
 
 import java.io.Serializable;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.serotonin.mango.rt.RuntimeManager;
 import com.serotonin.mango.rt.dataImage.DataPointRT;
 import com.serotonin.mango.view.ImplDefinition;
@@ -13,6 +14,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.web.mvc.api.exceptions.InternalServerErrorException;
+import org.scada_lts.web.mvc.api.exceptions.UnauthorizedException;
 import org.scada_lts.web.mvc.api.json.JsonBinaryEventTextRenderer;
 import org.scada_lts.web.mvc.api.json.JsonPointProperties;
 import org.springframework.http.HttpStatus;
@@ -20,7 +23,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.view.chart.ChartRenderer;
 import com.serotonin.mango.view.text.TextRenderer;
@@ -28,7 +30,6 @@
 import com.serotonin.mango.vo.User;
 
 import static org.scada_lts.utils.PointPropertiesApiUtils.*;
-import static org.scada_lts.utils.ValidationUtils.formatErrorsJson;
 import static org.scada_lts.utils.ValidationUtils.validId;
 
 /**
@@ -49,12 +50,16 @@ public class PointPropertiesAPI {
 
     private static final Log LOG = LogFactory.getLog(PointPropertiesAPI.class);
 
-    private DataPointService dataPointService = new DataPointService();
+    private final DataPointService dataPointService;
 
     private static final String SAVED_MSG = "saved";
 
+    public PointPropertiesAPI(DataPointService dataPointService) {
+        this.dataPointService = dataPointService;
+    }
+
     @RequestMapping(value = "/getPropertiesBaseOnId/{id}", method = RequestMethod.GET)
-    public ResponseEntity<String> getPropertiesBaseOnId(@PathVariable("id") int id, HttpServletRequest request) {
+    public ResponseEntity<PropertiesPointToJSON> getPropertiesBaseOnId(@PathVariable("id") int id, HttpServletRequest request) {
         LOG.info("/api/point_properties/getPropertiesBaseOnId/{id} id:" + id);
 
         try {
@@ -63,253 +68,6 @@ public ResponseEntity<String> getPropertiesBaseOnId(@PathVariable("id") int id,
             if (user != null) {
                 DataPointVO dpvo = dataPointService.getDataPoint(id);
 
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
-                ResourceBundle bundle = Common.getBundle(request);
-
-                class PropertiesPointToJSON implements Serializable {
-
-                    private static final long serialVersionUID = 1L;
-
-                    private String description;
-                    private int loggingType;
-                    private int intervalLoggingPeriod;
-                    private int intervalLoggingPeriodType;
-                    private int intervalLoggingType;
-                    private int purgeType;
-                    private int purgePeriod;
-                    private int defaultCacheSize;
-                    private String typeKey;
-                    private TextRenderer textRenderer;
-                    private EventTextRenderer eventTextRenderer;
-                    private ImplDefinition def;
-                    private ChartRenderer chartRenderer;
-                    private int engineeringUnits;
-                    private double tolerance;
-                    private boolean isDiscardExtremeValues;
-                    private double discardLowLimit;
-                    private double discardHighLimit;
-                    private int dataTypeId;
-                    private int purgeStrategy;
-                    private int purgeValuesLimit;
-
-
-                    public PropertiesPointToJSON(
-                            String description,
-                            int loggingType,
-                            int intervalLoggingPeriod,
-                            int intervalLoggingPeriodType,
-                            int purgeType,
-                            int purgePeriod,
-                            int defaultCacheSize,
-                            String typeKey,
-                            TextRenderer textRenderer,
-                            EventTextRenderer eventTextRenderer,
-                            ImplDefinition def,
-                            ChartRenderer chartRenderer,
-                            int engineeringUnits,
-                            double tolerance,
-                            int intervalLoggingType,
-                            boolean isDiscardExtremeValues,
-                            double discardLowLimit,
-                            double discardHighLimit,
-                            int dataTypeId,
-                            int purgeStrategy,
-                            int purgeValuesLimit
-                    ) {
-                        this.description = description;
-                        this.loggingType = loggingType;
-                        this.intervalLoggingPeriod = intervalLoggingPeriod;
-                        this.intervalLoggingPeriodType = intervalLoggingPeriodType;
-                        this.purgeType = purgeType;
-                        this.purgePeriod =  purgePeriod;
-                        this.defaultCacheSize = defaultCacheSize;
-                        this.typeKey = typeKey;
-                        this.textRenderer = textRenderer;
-                        this.eventTextRenderer = eventTextRenderer;
-                        this.def = def;
-                        this.chartRenderer = chartRenderer;
-                        this.engineeringUnits = engineeringUnits;
-                        this.tolerance = tolerance;
-                        this.intervalLoggingType = intervalLoggingType;
-                        this.isDiscardExtremeValues = isDiscardExtremeValues;
-                        this.discardLowLimit = discardLowLimit;
-                        this.discardHighLimit = discardHighLimit;
-                        this.dataTypeId = dataTypeId;
-                        this.purgeStrategy = purgeStrategy;
-                        this.purgeValuesLimit = purgeValuesLimit;
-                    }
-
-                    public String getDescription() {
-                        return description;
-                    }
-
-                    public void setDescription(String description) {
-                        this.description = description;
-                    }
-
-                    public int getLoggingType() {
-                        return loggingType;
-                    }
-
-                    public void setLoggingType(int loggingType) {
-                        this.loggingType = loggingType;
-                    }
-
-                    public int getIntervalLoggingPeriod() {
-                        return intervalLoggingPeriod;
-                    }
-
-                    public void setIntervalLoggingPeriod(int intervalLoggingPeriod) {
-                        this.intervalLoggingPeriod = intervalLoggingPeriod;
-                    }
-
-                    public int getIntervalLoggingPeriodType() {
-                        return intervalLoggingPeriodType;
-                    }
-
-                    public void setIntervalLoggingPeriodType(int intervalLoggingPeriodType) {
-                        this.intervalLoggingPeriodType = intervalLoggingPeriodType;
-                    }
-
-                    public int getPurgeType() {
-                        return purgeType;
-                    }
-
-                    public void setPurgeType(int purgeType) {
-                        this.purgeType = purgeType;
-                    }
-
-                    public int getDefaultCacheSize() {
-                        return defaultCacheSize;
-                    }
-
-                    public void setDefaultCacheSize(int defaultCacheSize) {
-                        this.defaultCacheSize = defaultCacheSize;
-                    }
-
-                    public String getTypeKey() {
-                        return typeKey;
-                    }
-
-                    public void setTypeKey(String typeKey) {
-                        this.typeKey = typeKey;
-                    }
-
-                    public TextRenderer getTextRenderer() {
-                        return textRenderer;
-                    }
-
-                    public void setTextRenderer(TextRenderer textRenderer) {
-                        this.textRenderer = textRenderer;
-                    }
-
-                    public EventTextRenderer getEventTextRenderer() {
-                        return eventTextRenderer;
-                    }
-
-                    public void setEventTextRenderer(EventTextRenderer eventTextRenderer) {
-                        this.eventTextRenderer = eventTextRenderer;
-                    }
-
-                    public ImplDefinition getDef() {
-                        return def;
-                    }
-
-                    public void setDef(ImplDefinition def) {
-                        this.def = def;
-                    }
-
-                    public ChartRenderer getChartRenderer() {
-                        return chartRenderer;
-                    }
-
-                    public void setChartRenderer(ChartRenderer chartRenderer) {
-                        this.chartRenderer = chartRenderer;
-                    }
-
-                    public int getEngineeringUnits() {
-                        return engineeringUnits;
-                    }
-
-                    public void setEngineeringUnits(int engineeringUnits) {
-                        this.engineeringUnits = engineeringUnits;
-                    }
-
-                    public double getTolerance() {
-                        return tolerance;
-                    }
-
-                    public void setTolerance(double tolerance) {
-                        this.tolerance = tolerance;
-                    }
-
-                    public int getIntervalLoggingType() {
-                        return intervalLoggingType;
-                    }
-
-                    public void setIntervalLoggingType(int intervalLoggingType) {
-                        this.intervalLoggingType = intervalLoggingType;
-                    }
-
-                    public boolean isDiscardExtremeValues() {
-                        return isDiscardExtremeValues;
-                    }
-
-                    public void setDiscardExtremeValues(boolean discardExtremeValues) {
-                        isDiscardExtremeValues = discardExtremeValues;
-                    }
-
-                    public double getDiscardLowLimit() {
-                        return discardLowLimit;
-                    }
-
-                    public void setDiscardLowLimit(double discardLowLimit) {
-                        this.discardLowLimit = discardLowLimit;
-                    }
-
-                    public double getDiscardHighLimit() {
-                        return discardHighLimit;
-                    }
-
-                    public void setDiscardHighLimit(double discardHighLimit) {
-                        this.discardHighLimit = discardHighLimit;
-                    }
-
-                    public int getPurgePeriod() {
-                        return purgePeriod;
-                    }
-
-                    public void setPurgePeriod(int purgePeriod) {
-                        this.purgePeriod = purgePeriod;
-                    }
-
-                    public int getDataTypeId() {
-                        return dataTypeId;
-                    }
-
-                    public void setDataTypeId(int dataTypeId) {
-                        this.dataTypeId = dataTypeId;
-                    }
-
-                    public int getPurgeStrategy() {
-                        return purgeStrategy;
-                    }
-
-                    public void setPurgeStrategy(int purgeStrategy) {
-                        this.purgeStrategy = purgeStrategy;
-                    }
-
-                    public int getPurgeValuesLimit() {
-                        return purgeValuesLimit;
-                    }
-
-                    public void setPurgeValuesLimit(int purgeValuesLimit) {
-                        this.purgeValuesLimit = purgeValuesLimit;
-                    }
-                }
-
                 PropertiesPointToJSON p = new PropertiesPointToJSON(
                         dpvo.getDescription(),
                         dpvo.getLoggingType(),
@@ -334,22 +92,20 @@ public void setPurgeValuesLimit(int purgeValuesLimit) {
                         dpvo.getPurgeValuesLimit()
                 );
 
-                json = mapper.writeValueAsString(p);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(p, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
 
     @RequestMapping(value = "/getProperties/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getProperties(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<PropertiesPointToJSON> getProperties(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/point_properties/getProperties/{xid} id:" + xid);
 
         try {
@@ -357,266 +113,8 @@ public ResponseEntity<String> getProperties(@PathVariable("xid") String xid, Htt
             User user = Common.getUser(request);
             if (user != null) {
                 DataPointVO dpvo = dataPointService.getDataPoint(xid);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 ResourceBundle bundle = Common.getBundle(request);
 
-                class PropertiesPointToJSON implements Serializable {
-
-                    private static final long serialVersionUID = 1L;
-
-                    private String chartColour;
-                    private ChartRenderer chartRenderer;
-                    private String descConfiguration;
-                    private String dataSourceName;
-                    private String dataSourceXId;
-                    private String dataTypeMessage;
-                    private String deviceName;
-                    private String description;
-                    private Double discardHighLimit;
-                    private Double discardLowLimit;
-                    private int engineeringUnits;
-                    private String extendedName;
-                    private EventTextRenderer eventTextRenderer;
-                    private int intervalLoggingPeriod;
-                    private int intervalLoggingPeriodType;
-                    private int intervalLoggingType;
-                    private String name;
-                    private int purgePeriod;
-                    private int purgeType;
-                    private TextRenderer textRenderer;
-                    private double tolerance;
-                    private String typeKey;
-                    private int purgeStrategy;
-                    private int purgeValuesLimit;
-
-                    public PropertiesPointToJSON(String chartColour, ChartRenderer chartRenderer, String descConfiguration, String dataSourceName, String dataSourceXId,
-                                                 String dataTypeMessage, String deviceName, String description, Double discardHighLimit, Double discardLowLimit, int engineeringUnits, String extendedName, EventTextRenderer eventTextRenderer,
-                                                 int intervalLoggingPeriod, int intervalLoggingPeriodType, int intervalLoggingType, String name, int purgePeriod, int purgeType, TextRenderer textRenderer, double tolerance, String typeKey,
-                                                 int purgeStrategy, int purgeValuesLimit) {
-
-                        this.chartColour = chartColour;
-                        this.chartRenderer = chartRenderer;
-                        this.descConfiguration = descConfiguration;
-                        this.dataSourceName = dataSourceName;
-                        this.dataSourceXId = dataSourceXId;
-                        this.dataTypeMessage = dataTypeMessage;
-                        this.deviceName = deviceName;
-                        this.description = description;
-                        this.discardHighLimit = discardHighLimit;
-                        this.discardLowLimit = discardLowLimit;
-                        this.engineeringUnits = engineeringUnits;
-                        this.extendedName = extendedName;
-                        this.eventTextRenderer = eventTextRenderer;
-                        this.intervalLoggingPeriod = intervalLoggingPeriod;
-                        this.intervalLoggingPeriodType = intervalLoggingPeriodType;
-                        this.intervalLoggingType = intervalLoggingType;
-                        this.name = name;
-                        this.purgePeriod = purgePeriod;
-                        this.purgeType = purgeType;
-                        this.textRenderer = textRenderer;
-                        this.tolerance = tolerance;
-                        this.typeKey = typeKey;
-                        this.purgeStrategy = purgeStrategy;
-                        this.purgeValuesLimit = purgeValuesLimit;
-                    }
-
-                    public String getChartColour() {
-                        return chartColour;
-                    }
-
-                    public void setChartColour(String chartColour) {
-                        this.chartColour = chartColour;
-                    }
-
-                    public ChartRenderer getChartRenderer() {
-                        return chartRenderer;
-                    }
-
-                    public void setChartRenderer(ChartRenderer chartRenderer) {
-                        this.chartRenderer = chartRenderer;
-                    }
-
-                    public String getDescConfiguration() {
-                        return descConfiguration;
-                    }
-
-                    public void setDescConfiguration(String descConfiguration) {
-                        this.descConfiguration = descConfiguration;
-                    }
-
-                    public String getDataSourceName() {
-                        return dataSourceName;
-                    }
-
-                    public void setDataSourceName(String dataSourceName) {
-                        this.dataSourceName = dataSourceName;
-                    }
-
-                    public String getDataSourceXId() {
-                        return dataSourceXId;
-                    }
-
-                    public void setDataSourceXId(String dataSourceXId) {
-                        this.dataSourceXId = dataSourceXId;
-                    }
-
-                    public String getDataTypeMessage() {
-                        return dataTypeMessage;
-                    }
-
-                    public void setDataTypeMessage(String dataTypeMessage) {
-                        this.dataTypeMessage = dataTypeMessage;
-                    }
-
-                    public String getDeviceName() {
-                        return deviceName;
-                    }
-
-                    public void setDeviceName(String deviceName) {
-                        this.deviceName = deviceName;
-                    }
-
-                    public String getDescription() {
-                        return description;
-                    }
-
-                    public void setDescription(String description) {
-                        this.description = description;
-                    }
-
-                    public Double getDiscardHighLimit() {
-                        return discardHighLimit;
-                    }
-
-                    public void setDiscardHighLimit(Double discardHighLimit) {
-                        this.discardHighLimit = discardHighLimit;
-                    }
-
-                    public Double getDiscardLowLimit() {
-                        return discardLowLimit;
-                    }
-
-                    public void setDiscardLowLimit(Double discardLowLimit) {
-                        this.discardLowLimit = discardLowLimit;
-                    }
-
-                    public int getEngineeringUnits() {
-                        return engineeringUnits;
-                    }
-
-                    public void setEngineeringUnits(int engineeringUnits) {
-                        this.engineeringUnits = engineeringUnits;
-                    }
-
-                    public String getExtendedName() {
-                        return extendedName;
-                    }
-
-                    public void setExtendedName(String extendedName) {
-                        this.extendedName = extendedName;
-                    }
-
-                    public EventTextRenderer getEventTextRenderer() {
-                        return eventTextRenderer;
-                    }
-
-                    public void setEventTextRenderer(EventTextRenderer eventTextRenderer) {
-                        this.eventTextRenderer = eventTextRenderer;
-                    }
-
-                    public int getIntervalLoggingPeriod() {
-                        return intervalLoggingPeriod;
-                    }
-
-                    public void setIntervalLoggingPeriod(int intervalLoggingPeriod) {
-                        this.intervalLoggingPeriod = intervalLoggingPeriod;
-                    }
-
-                    public int getIntervalLoggingPeriodType() {
-                        return intervalLoggingPeriodType;
-                    }
-
-                    public void setIntervalLoggingPeriodType(int intervalLoggingPeriodType) {
-                        this.intervalLoggingPeriodType = intervalLoggingPeriodType;
-                    }
-
-                    public int getIntervalLoggingType() {
-                        return intervalLoggingType;
-                    }
-
-                    public void setIntervalLoggingType(int intervalLoggingType) {
-                        this.intervalLoggingType = intervalLoggingType;
-                    }
-
-                    public String getName() {
-                        return name;
-                    }
-
-                    public void setName(String name) {
-                        this.name = name;
-                    }
-
-                    public int getPurgePeriod() {
-                        return purgePeriod;
-                    }
-
-                    public void setPurgePeriod(int purgePeriod) {
-                        this.purgePeriod = purgePeriod;
-                    }
-
-                    public int getPurgeType() {
-                        return purgeType;
-                    }
-
-                    public void setPurgeType(int purgeType) {
-                        this.purgeType = purgeType;
-                    }
-
-                    public TextRenderer getTextRenderer() {
-                        return textRenderer;
-                    }
-
-                    public void setTextRenderer(TextRenderer textRenderer) {
-                        this.textRenderer = textRenderer;
-                    }
-
-                    public double getTolerance() {
-                        return tolerance;
-                    }
-
-                    public void setTolerance(double tolerance) {
-                        this.tolerance = tolerance;
-                    }
-
-                    public String getTypeKey() {
-                        return typeKey;
-                    }
-
-                    public void setTypeKey(String typeKey) {
-                        this.typeKey = typeKey;
-                    }
-
-                    public int getPurgeStrategy() {
-                        return purgeStrategy;
-                    }
-
-                    public void setPurgeStrategy(int purgeStrategy) {
-                        this.purgeStrategy = purgeStrategy;
-                    }
-
-                    public int getPurgeValuesLimit() {
-                        return purgeValuesLimit;
-                    }
-
-                    public void setPurgeValuesLimit(int purgeValuesLimit) {
-                        this.purgeValuesLimit = purgeValuesLimit;
-                    }
-                }
-
-                //dpvo.isDiscardExtremeValues()
-
                 PropertiesPointToJSON p = new PropertiesPointToJSON(
                         dpvo.getChartColour(),
                         dpvo.getChartRenderer(),
@@ -645,39 +143,43 @@ public void setPurgeValuesLimit(int purgeValuesLimit) {
                         dpvo.getPurgeStrategy(),
                         dpvo.getPurgeValuesLimit());
 
-                json = mapper.writeValueAsString(p);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(p, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
 
     }
 
     @PutMapping(value = "/updateProperties")
-    public ResponseEntity<String> updatePointProperties(@RequestParam(required = false) Integer id,
+    public ResponseEntity<Map<String, String>> updatePointProperties(@RequestParam(required = false) Integer id,
                                                         @RequestParam(required = false) String xid,
                                                         HttpServletRequest request,
-                                                        @RequestBody JsonPointProperties body) {
+                                                        @RequestBody @Valid JsonPointProperties body) {
         try {
             User user = Common.getUser(request);
             if (user != null) {
+                Map<String, String> response = new HashMap<>();
                 String error = validPointProperties(id, xid, body);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
 
                 return getDataPointByIdOrXid(id, xid, dataPointService).map(dataPoint -> {
                     updateValuePointProperties(dataPoint, body);
                     dataPointService.updateDataPoint(dataPoint);
                     Common.ctx.getRuntimeManager().saveDataPoint(dataPoint);
-                    return new ResponseEntity<>(SAVED_MSG, HttpStatus.OK);
-                }).orElse(new ResponseEntity<>(formatErrorsJson("dataPoint not found"), HttpStatus.NOT_FOUND));
+                    response.put("status", SAVED_MSG);
+                    return new ResponseEntity<>(response, HttpStatus.OK);
+                }).orElseGet(() -> {
+                    response.put("errors", "dataPoint not found");
+                    return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
+                });
 
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -689,7 +191,7 @@ public ResponseEntity<String> updatePointProperties(@RequestParam(required = fal
     }
 
     @GetMapping(value = "/getPointDescription", produces = "application/json")
-    public ResponseEntity<String> getPointDescription(@RequestParam(required = false) Integer id,
+    public ResponseEntity<Map<String, String>> getPointDescription(@RequestParam(required = false) Integer id,
                                                       @RequestParam(required = false) String xid,
                                                       HttpServletRequest request) {
         LOG.info("/api/point_properties/getPointDescription");
@@ -698,7 +200,9 @@ public ResponseEntity<String> getPointDescription(@RequestParam(required = false
             if (user != null && user.isAdmin()) {
                 String error = validId(id, xid);
                 if(!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    Map<String, String> errors = new HashMap<>();
+                    errors.put("errors", error);
+                    return ResponseEntity.badRequest().body(errors);
                 }
                 return getPointDescription(id, xid);
             } else {
@@ -739,7 +243,7 @@ public ResponseEntity<JsonBinaryEventTextRenderer> getBinaryEventRenderer(@Reque
     }
 
     @PatchMapping(value = "/{id}/purgeNowPeriod")
-    public ResponseEntity<String> purgeNowPeriodDataPointValues(@PathVariable("id") Integer id,
+    public ResponseEntity<Map<String, String>> purgeNowPeriodDataPointValues(@PathVariable("id") Integer id,
                                                        @RequestParam Integer type,
                                                        @RequestParam Integer period,
                                                        HttpServletRequest request) {
@@ -748,7 +252,9 @@ public ResponseEntity<String> purgeNowPeriodDataPointValues(@PathVariable("id")
             if(user != null) {
                 String error = validPurgeTypeAndPeriod(type,period);
                 if(!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    Map<String, String> errors = new HashMap<>();
+                    errors.put("errors", error);
+                    return ResponseEntity.badRequest().body(errors);
                 }
                 return purgeNowPeriodDataPointValues(id, type, period);
             } else {
@@ -760,7 +266,7 @@ public ResponseEntity<String> purgeNowPeriodDataPointValues(@PathVariable("id")
     }
 
     @PatchMapping(value = "/{id}/purgeNowAll")
-    public ResponseEntity<String> purgeNowAllDataPointValues(@PathVariable("id") Integer id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> purgeNowAllDataPointValues(@PathVariable("id") Integer id, HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if(user != null) {
@@ -774,7 +280,7 @@ public ResponseEntity<String> purgeNowAllDataPointValues(@PathVariable("id") Int
     }
 
     @PatchMapping(value = "/{id}/purgeNowLimit")
-    public ResponseEntity<String> purgeNowWithLimitDataPointValues(@PathVariable("id") Integer id,
+    public ResponseEntity<Map<String, String>> purgeNowWithLimitDataPointValues(@PathVariable("id") Integer id,
                                                                 @RequestParam Integer limit,
                                                                 HttpServletRequest request) {
         try {
@@ -782,7 +288,9 @@ public ResponseEntity<String> purgeNowWithLimitDataPointValues(@PathVariable("id
             if(user != null) {
                 String error = validPurgeLimit(limit);
                 if(!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    Map<String, String> errors = new HashMap<>();
+                    errors.put("errors", error);
+                    return ResponseEntity.badRequest().body(errors);
                 }
                 return purgeNowWithLimitDataPointValues(id, limit);
             } else {
@@ -815,19 +323,22 @@ public ResponseEntity<String> clearDataPointCache(@PathVariable("id") int id, Ht
     }
 
     @PatchMapping(value = "/{id}/toggle")
-    public ResponseEntity<String> toggleDataPoint(@PathVariable("id") int id, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> toggleDataPoint(@PathVariable("id") int id, HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if(user != null) {
+                Map<String, String> response = new HashMap<>();
                 DataPointVO point = dataPointService.getDataPoint(id);
                 RuntimeManager rm = Common.ctx.getRuntimeManager();
                 point.setEnabled(!point.isEnabled());
                 rm.saveDataPoint(point);
 
                 if(point.isEnabled()) {
-                    return new ResponseEntity<>("{\"enabled\":true}", HttpStatus.OK);
+                    response.put("enabled", "true");
+                    return new ResponseEntity<>(response, HttpStatus.OK);
                 } else {
-                    return new ResponseEntity<>("{\"enabled\":false}", HttpStatus.OK);
+                    response.put("enabled", "false");
+                    return new ResponseEntity<>(response, HttpStatus.OK);
                 }
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -837,24 +348,18 @@ public ResponseEntity<String> toggleDataPoint(@PathVariable("id") int id, HttpSe
         }
     }
 
-    private ResponseEntity<String> getPointDescription(Integer id, String xid) {
+    private ResponseEntity<Map<String, String>> getPointDescription(Integer id, String xid) {
         Map<String, String> response = new HashMap<>();
         getDataPointByIdOrXid(id, xid, dataPointService)
                 .ifPresent(a -> response.put("description", a.getDescription()));
         if(response.isEmpty()) {
-            return new ResponseEntity<>(formatErrorsJson("dataPoint not found"),HttpStatus.NOT_FOUND);
-        }
-        ObjectMapper mapper = new ObjectMapper();
-        try {
-            String json = mapper.writeValueAsString(response);
-            return new ResponseEntity<>(json, HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            LOG.error(e.getMessage(), e);
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+            response.put("errors", "dataPoint not found");
+            return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
         }
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
-    private ResponseEntity<String> purgeNowPeriodDataPointValues(Integer id, Integer type, Integer period) {
+    private ResponseEntity<Map<String, String>> purgeNowPeriodDataPointValues(Integer id, Integer type, Integer period) {
         RuntimeManager rm = Common.ctx.getRuntimeManager();
         Map<String, Long> response = new HashMap<>();
         getDataPointById(id, dataPointService)
@@ -862,7 +367,7 @@ private ResponseEntity<String> purgeNowPeriodDataPointValues(Integer id, Integer
         return prepareResponseForDataPurge(response);
     }
 
-    private ResponseEntity<String> purgeNowAllDataPointValues(Integer id) {
+    private ResponseEntity<Map<String, String>> purgeNowAllDataPointValues(Integer id) {
         RuntimeManager rm = Common.ctx.getRuntimeManager();
         Map<String, Long> response = new HashMap<>();
         getDataPointById(id, dataPointService)
@@ -870,7 +375,7 @@ private ResponseEntity<String> purgeNowAllDataPointValues(Integer id) {
         return prepareResponseForDataPurge(response);
     }
 
-    private ResponseEntity<String> purgeNowWithLimitDataPointValues(Integer id, Integer limit) {
+    private ResponseEntity<Map<String, String>> purgeNowWithLimitDataPointValues(Integer id, Integer limit) {
         RuntimeManager rm = Common.ctx.getRuntimeManager();
         Map<String, Long> response = new HashMap<>();
         getDataPointById(id, dataPointService)
@@ -878,17 +383,354 @@ private ResponseEntity<String> purgeNowWithLimitDataPointValues(Integer id, Inte
         return prepareResponseForDataPurge(response);
     }
 
-    private ResponseEntity<String> prepareResponseForDataPurge(Map<String, Long> response) {
+    private ResponseEntity<Map<String, String>> prepareResponseForDataPurge(Map<String, Long> response) {
         if(response.isEmpty()) {
-            return new ResponseEntity<>(formatErrorsJson("dataPoint not found"),HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }
-        ObjectMapper mapper = new ObjectMapper();
-        try {
-            String json = mapper.writeValueAsString(response);
-            return new ResponseEntity<>(json, HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            LOG.error(e.getMessage(), e);
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        return new ResponseEntity<>(response.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> String.valueOf(entry.getValue()))), HttpStatus.OK);
+    }
+
+    static class PropertiesPointToJSON implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        private String chartColour;
+        private ChartRenderer chartRenderer;
+        private String descConfiguration;
+        private String dataSourceName;
+        private String dataSourceXId;
+        private String dataTypeMessage;
+        private String deviceName;
+        private String description;
+        private Double discardHighLimit;
+        private Double discardLowLimit;
+        private int engineeringUnits;
+        private String extendedName;
+        private EventTextRenderer eventTextRenderer;
+        private int intervalLoggingPeriod;
+        private int intervalLoggingPeriodType;
+        private int intervalLoggingType;
+        private String name;
+        private int purgePeriod;
+        private int purgeType;
+        private TextRenderer textRenderer;
+        private double tolerance;
+        private String typeKey;
+        private int purgeStrategy;
+        private int purgeValuesLimit;
+        private int loggingType;
+        private int defaultCacheSize;
+        private ImplDefinition def;
+        private boolean isDiscardExtremeValues;
+        private int dataTypeId;
+
+        public PropertiesPointToJSON(
+                String description,
+                int loggingType,
+                int intervalLoggingPeriod,
+                int intervalLoggingPeriodType,
+                int purgeType,
+                int purgePeriod,
+                int defaultCacheSize,
+                String typeKey,
+                TextRenderer textRenderer,
+                EventTextRenderer eventTextRenderer,
+                ImplDefinition def,
+                ChartRenderer chartRenderer,
+                int engineeringUnits,
+                double tolerance,
+                int intervalLoggingType,
+                boolean isDiscardExtremeValues,
+                double discardLowLimit,
+                double discardHighLimit,
+                int dataTypeId,
+                int purgeStrategy,
+                int purgeValuesLimit
+        ) {
+            this.description = description;
+            this.loggingType = loggingType;
+            this.intervalLoggingPeriod = intervalLoggingPeriod;
+            this.intervalLoggingPeriodType = intervalLoggingPeriodType;
+            this.purgeType = purgeType;
+            this.purgePeriod =  purgePeriod;
+            this.defaultCacheSize = defaultCacheSize;
+            this.typeKey = typeKey;
+            this.textRenderer = textRenderer;
+            this.eventTextRenderer = eventTextRenderer;
+            this.def = def;
+            this.chartRenderer = chartRenderer;
+            this.engineeringUnits = engineeringUnits;
+            this.tolerance = tolerance;
+            this.intervalLoggingType = intervalLoggingType;
+            this.isDiscardExtremeValues = isDiscardExtremeValues;
+            this.discardLowLimit = discardLowLimit;
+            this.discardHighLimit = discardHighLimit;
+            this.dataTypeId = dataTypeId;
+            this.purgeStrategy = purgeStrategy;
+            this.purgeValuesLimit = purgeValuesLimit;
+        }
+
+        public PropertiesPointToJSON(String chartColour, ChartRenderer chartRenderer, String descConfiguration, String dataSourceName, String dataSourceXId,
+                                     String dataTypeMessage, String deviceName, String description, Double discardHighLimit, Double discardLowLimit, int engineeringUnits, String extendedName, EventTextRenderer eventTextRenderer,
+                                     int intervalLoggingPeriod, int intervalLoggingPeriodType, int intervalLoggingType, String name, int purgePeriod, int purgeType, TextRenderer textRenderer, double tolerance, String typeKey,
+                                     int purgeStrategy, int purgeValuesLimit) {
+
+            this.chartColour = chartColour;
+            this.chartRenderer = chartRenderer;
+            this.descConfiguration = descConfiguration;
+            this.dataSourceName = dataSourceName;
+            this.dataSourceXId = dataSourceXId;
+            this.dataTypeMessage = dataTypeMessage;
+            this.deviceName = deviceName;
+            this.description = description;
+            this.discardHighLimit = discardHighLimit;
+            this.discardLowLimit = discardLowLimit;
+            this.engineeringUnits = engineeringUnits;
+            this.extendedName = extendedName;
+            this.eventTextRenderer = eventTextRenderer;
+            this.intervalLoggingPeriod = intervalLoggingPeriod;
+            this.intervalLoggingPeriodType = intervalLoggingPeriodType;
+            this.intervalLoggingType = intervalLoggingType;
+            this.name = name;
+            this.purgePeriod = purgePeriod;
+            this.purgeType = purgeType;
+            this.textRenderer = textRenderer;
+            this.tolerance = tolerance;
+            this.typeKey = typeKey;
+            this.purgeStrategy = purgeStrategy;
+            this.purgeValuesLimit = purgeValuesLimit;
+        }
+
+        public String getChartColour() {
+            return chartColour;
+        }
+
+        public void setChartColour(String chartColour) {
+            this.chartColour = chartColour;
+        }
+
+        public ChartRenderer getChartRenderer() {
+            return chartRenderer;
+        }
+
+        public void setChartRenderer(ChartRenderer chartRenderer) {
+            this.chartRenderer = chartRenderer;
+        }
+
+        public String getDescConfiguration() {
+            return descConfiguration;
+        }
+
+        public void setDescConfiguration(String descConfiguration) {
+            this.descConfiguration = descConfiguration;
+        }
+
+        public String getDataSourceName() {
+            return dataSourceName;
+        }
+
+        public void setDataSourceName(String dataSourceName) {
+            this.dataSourceName = dataSourceName;
+        }
+
+        public String getDataSourceXId() {
+            return dataSourceXId;
+        }
+
+        public void setDataSourceXId(String dataSourceXId) {
+            this.dataSourceXId = dataSourceXId;
+        }
+
+        public String getDataTypeMessage() {
+            return dataTypeMessage;
+        }
+
+        public void setDataTypeMessage(String dataTypeMessage) {
+            this.dataTypeMessage = dataTypeMessage;
+        }
+
+        public String getDeviceName() {
+            return deviceName;
+        }
+
+        public void setDeviceName(String deviceName) {
+            this.deviceName = deviceName;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public Double getDiscardHighLimit() {
+            return discardHighLimit;
+        }
+
+        public void setDiscardHighLimit(Double discardHighLimit) {
+            this.discardHighLimit = discardHighLimit;
+        }
+
+        public Double getDiscardLowLimit() {
+            return discardLowLimit;
+        }
+
+        public void setDiscardLowLimit(Double discardLowLimit) {
+            this.discardLowLimit = discardLowLimit;
+        }
+
+        public int getEngineeringUnits() {
+            return engineeringUnits;
+        }
+
+        public void setEngineeringUnits(int engineeringUnits) {
+            this.engineeringUnits = engineeringUnits;
+        }
+
+        public String getExtendedName() {
+            return extendedName;
+        }
+
+        public void setExtendedName(String extendedName) {
+            this.extendedName = extendedName;
+        }
+
+        public EventTextRenderer getEventTextRenderer() {
+            return eventTextRenderer;
+        }
+
+        public void setEventTextRenderer(EventTextRenderer eventTextRenderer) {
+            this.eventTextRenderer = eventTextRenderer;
+        }
+
+        public int getIntervalLoggingPeriod() {
+            return intervalLoggingPeriod;
+        }
+
+        public void setIntervalLoggingPeriod(int intervalLoggingPeriod) {
+            this.intervalLoggingPeriod = intervalLoggingPeriod;
+        }
+
+        public int getIntervalLoggingPeriodType() {
+            return intervalLoggingPeriodType;
+        }
+
+        public void setIntervalLoggingPeriodType(int intervalLoggingPeriodType) {
+            this.intervalLoggingPeriodType = intervalLoggingPeriodType;
+        }
+
+        public int getIntervalLoggingType() {
+            return intervalLoggingType;
+        }
+
+        public void setIntervalLoggingType(int intervalLoggingType) {
+            this.intervalLoggingType = intervalLoggingType;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getPurgePeriod() {
+            return purgePeriod;
+        }
+
+        public void setPurgePeriod(int purgePeriod) {
+            this.purgePeriod = purgePeriod;
+        }
+
+        public int getPurgeType() {
+            return purgeType;
+        }
+
+        public void setPurgeType(int purgeType) {
+            this.purgeType = purgeType;
+        }
+
+        public TextRenderer getTextRenderer() {
+            return textRenderer;
+        }
+
+        public void setTextRenderer(TextRenderer textRenderer) {
+            this.textRenderer = textRenderer;
+        }
+
+        public double getTolerance() {
+            return tolerance;
+        }
+
+        public void setTolerance(double tolerance) {
+            this.tolerance = tolerance;
+        }
+
+        public String getTypeKey() {
+            return typeKey;
+        }
+
+        public void setTypeKey(String typeKey) {
+            this.typeKey = typeKey;
+        }
+
+        public int getPurgeStrategy() {
+            return purgeStrategy;
+        }
+
+        public void setPurgeStrategy(int purgeStrategy) {
+            this.purgeStrategy = purgeStrategy;
+        }
+
+        public int getPurgeValuesLimit() {
+            return purgeValuesLimit;
+        }
+
+        public void setPurgeValuesLimit(int purgeValuesLimit) {
+            this.purgeValuesLimit = purgeValuesLimit;
+        }
+
+        public int getLoggingType() {
+            return loggingType;
+        }
+
+        public void setLoggingType(int loggingType) {
+            this.loggingType = loggingType;
+        }
+
+        public int getDefaultCacheSize() {
+            return defaultCacheSize;
+        }
+
+        public void setDefaultCacheSize(int defaultCacheSize) {
+            this.defaultCacheSize = defaultCacheSize;
+        }
+
+        public ImplDefinition getDef() {
+            return def;
+        }
+
+        public void setDef(ImplDefinition def) {
+            this.def = def;
+        }
+
+        public boolean isDiscardExtremeValues() {
+            return isDiscardExtremeValues;
+        }
+
+        public void setDiscardExtremeValues(boolean discardExtremeValues) {
+            isDiscardExtremeValues = discardExtremeValues;
+        }
+
+        public int getDataTypeId() {
+            return dataTypeId;
+        }
+
+        public void setDataTypeId(int dataTypeId) {
+            this.dataTypeId = dataTypeId;
         }
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/PointValueAPI.java b/src/org/scada_lts/web/mvc/api/PointValueAPI.java
index ad35df22a8..dbd2211463 100644
--- a/src/org/scada_lts/web/mvc/api/PointValueAPI.java
+++ b/src/org/scada_lts/web/mvc/api/PointValueAPI.java
@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.serotonin.mango.DataTypes;
@@ -13,14 +12,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.mango.service.DataPointService;
-import org.scada_lts.mango.service.DataSourceService;
 import org.scada_lts.mango.service.PointValueService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.rt.dataImage.PointValueTime;
 import com.serotonin.mango.rt.dataImage.types.AlphanumericValue;
@@ -321,11 +318,13 @@ public class PointValueAPI {
 
     private static final Log LOG = LogFactory.getLog(PointValueAPI.class);
 
-    private DataPointService dataPointService = new DataPointService();
-    private DataSourceService dataSourceService = new DataSourceService();
+    private final DataPointService dataPointService;
+    private final PointValueService pointValueService;
 
-    @Resource
-    private PointValueService pointValueService;
+    public PointValueAPI(DataPointService dataPointService,PointValueService pointValueService) {
+        this.dataPointService = dataPointService;
+        this.pointValueService = pointValueService;
+    }
 
     private String getValue(MangoValue value, String type) {
 
@@ -356,7 +355,7 @@ private String getValue(MangoValue value, String type) {
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValue/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValue(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<ValueToJSON> getValue(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/point_value/getValue/{xid} id:" + xid);
 
         try {
@@ -365,25 +364,22 @@ public ResponseEntity<String> getValue(@PathVariable("xid") String xid, HttpServ
             if (user != null) {
                 DataPointVO dpvo = dataPointService.getDataPoint(xid);
                 PointValueTime pvt = pointValueService.getLatestPointValue(dpvo.getId());
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
+
+                // API should show datapoint is disabled if datasource is disabled
+                dpvo.setEnabled(dataPointService.isDataPointRunning(dpvo));
 
                 ValueToJSON v = new ValueToJSON();
                 if (pvt != null)
                     v.set(pvt, dpvo);
                 else
                     v.setDataPoint(dpvo);
-
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
-
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -393,7 +389,7 @@ public ResponseEntity<String> getValue(@PathVariable("xid") String xid, HttpServ
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValue/id/{id}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValue(@PathVariable("id") int id, HttpServletRequest request) {
+    public ResponseEntity<ValueToJSON> getValue(@PathVariable("id") int id, HttpServletRequest request) {
         LOG.info("/api/point_value/getValue/id/{id} id:" + id);
 
         try {
@@ -402,25 +398,23 @@ public ResponseEntity<String> getValue(@PathVariable("id") int id, HttpServletRe
             if (user != null) {
                 DataPointVO dpvo = dataPointService.getDataPoint(id);
                 PointValueTime pvt = pointValueService.getLatestPointValue(dpvo.getId());
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
+
+                // API should show datapoint is disabled if datasource is disabled
+                dpvo.setEnabled(dataPointService.isDataPointRunning(dpvo));
 
                 ValueToJSON v = new ValueToJSON();
                 if (pvt != null)
                     v.set(pvt, dpvo);
                 else
                     v.setDataPoint(dpvo);
-
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -533,7 +527,7 @@ public ResponseEntity<String> setValueGet(
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValuesFromTime/{ts}/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValuesFromTime(@PathVariable("ts") long ts, @PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<ValuesToJSON> getValuesFromTime(@PathVariable("ts") long ts, @PathVariable("xid") String xid, HttpServletRequest request) {
 
         LOG.info("/api/point_value/getValuesFromTime/{ts}/{xid} ts:" + ts + " id:" + xid);
 
@@ -543,8 +537,6 @@ public ResponseEntity<String> getValuesFromTime(@PathVariable("ts") long ts, @Pa
             if (user != null) {
                 long to = System.currentTimeMillis();
                 List<PointValueTime> pvts = pointValueService.getPointValuesBetween(dpvo.getId(), ts, to);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
 
                 List<ValueTime> values = new ArrayList<ValueTime>();
                 String type = null;
@@ -552,16 +544,14 @@ public ResponseEntity<String> getValuesFromTime(@PathVariable("ts") long ts, @Pa
                     values.add(new ValueTime(getValue(pvt.getValue(), type), pvt.getTime()));
                 }
                 ValuesToJSON v = new ValuesToJSON(values, dpvo, type, ts, to);
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -571,7 +561,7 @@ public ResponseEntity<String> getValuesFromTime(@PathVariable("ts") long ts, @Pa
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValuesFromTime/id/{ts}/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValuesFromTimeId(@PathVariable("ts") long ts, @PathVariable("xid") int id, HttpServletRequest request) {
+    public ResponseEntity<ValuesToJSON> getValuesFromTimeId(@PathVariable("ts") long ts, @PathVariable("xid") int id, HttpServletRequest request) {
 
         LOG.info("/api/point_value/getValuesFromTime/{ts}/{xid} ts:" + ts + " id:" + id);
 
@@ -581,25 +571,20 @@ public ResponseEntity<String> getValuesFromTimeId(@PathVariable("ts") long ts, @
             if (user != null) {
                 long to = System.currentTimeMillis();
                 List<PointValueTime> pvts = pointValueService.getPointValuesBetween(dpvo.getId(), ts, to);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 List<ValueTime> values = new ArrayList<ValueTime>();
                 String type = null;
                 for (PointValueTime pvt : pvts) {
                     values.add(new ValueTime(getValue(pvt.getValue(), type), pvt.getTime()));
                 }
                 ValuesToJSON v = new ValuesToJSON(values, dpvo, type, ts, to);
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -611,7 +596,7 @@ public ResponseEntity<String> getValuesFromTimeId(@PathVariable("ts") long ts, @
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValuesFromTimePeriod/xid/{xid}/{sts}/{ets}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValuesFromTimePeriodXid(@PathVariable("xid") String xid, @PathVariable("sts") long sts, @PathVariable("ets") long ets, HttpServletRequest request) {
+    public ResponseEntity<ValuesToJSON> getValuesFromTimePeriodXid(@PathVariable("xid") String xid, @PathVariable("sts") long sts, @PathVariable("ets") long ets, HttpServletRequest request) {
 
         LOG.info("/api/point_value/getValuesFromTimePeriod/xid/{id}/{sts}/{ets} id: " + xid + " sts: " + sts + " ets: " + ets);
 
@@ -620,9 +605,6 @@ public ResponseEntity<String> getValuesFromTimePeriodXid(@PathVariable("xid") St
             DataPointVO dpvo = dataPointService.getDataPoint(xid);
             if (user != null) {
                 List<PointValueTime> pvts = pointValueService.getPointValuesBetween(dpvo.getId(), sts, ets);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 List<ValueTime> values = new ArrayList<ValueTime>();
                 String type = null;
                 if(pvts.size() > 0) {
@@ -636,16 +618,14 @@ public ResponseEntity<String> getValuesFromTimePeriodXid(@PathVariable("xid") St
                     values.add(new ValueTime(getValue(pvt.getValue(), type), pvt.getTime()));
                 }
                 ValuesToJSON v = new ValuesToJSON(values, dpvo, type, sts, ets);
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
@@ -655,7 +635,7 @@ public ResponseEntity<String> getValuesFromTimePeriodXid(@PathVariable("xid") St
      * @return
      */
     @RequestMapping(value = "/api/point_value/getValuesFromTimePeriod/{id}/{sts}/{ets}", method = RequestMethod.GET)
-    public ResponseEntity<String> getValuesFromTimePeriod(@PathVariable("id") int id, @PathVariable("sts") long sts, @PathVariable("ets") long ets, HttpServletRequest request) {
+    public ResponseEntity<ValuesToJSON> getValuesFromTimePeriod(@PathVariable("id") int id, @PathVariable("sts") long sts, @PathVariable("ets") long ets, HttpServletRequest request) {
 
         LOG.info("/api/point_value/getValuesFromTimePeriod/{id}/{sts}/{ets} id: " + id + " sts: " + sts + " ets: " + ets);
 
@@ -664,9 +644,6 @@ public ResponseEntity<String> getValuesFromTimePeriod(@PathVariable("id") int id
             DataPointVO dpvo = dataPointService.getDataPoint(id);
             if (user != null) {
                 List<PointValueTime> pvts = pointValueService.getPointValuesBetween(dpvo.getId(), sts, ets);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-
                 List<ValueTime> values = new ArrayList<ValueTime>();
                 String type = null;
                 if(pvts.size() > 0) {
@@ -680,16 +657,14 @@ public ResponseEntity<String> getValuesFromTimePeriod(@PathVariable("id") int id
                     values.add(new ValueTime(getValue(pvt.getValue(), type), pvt.getTime()));
                 }
                 ValuesToJSON v = new ValuesToJSON(values, dpvo, type, sts, ets);
-                json = mapper.writeValueAsString(v);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(v, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
diff --git a/src/org/scada_lts/web/mvc/api/ReportsAPI.java b/src/org/scada_lts/web/mvc/api/ReportsAPI.java
index e31498499a..b6d69666cb 100644
--- a/src/org/scada_lts/web/mvc/api/ReportsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ReportsAPI.java
@@ -13,6 +13,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.*;
 
 /**
@@ -63,7 +64,7 @@ public ResponseEntity<String> deleteReport(@PathVariable("id") Integer id, HttpS
      * @return ReportVO List
      */
     @PostMapping(value = "/save")
-    public HttpEntity<String> save(@RequestBody ReportDTO query, HttpServletRequest request) {
+    public HttpEntity<String> save(@RequestBody @Valid ReportDTO query, HttpServletRequest request) {
         LOG.info("GET::/api/reports/save");
         ReportVO report = reportsApiService.toReport(request, query);
         reportsApiService.create(request, report);
diff --git a/src/org/scada_lts/web/mvc/api/ReportsApiService.java b/src/org/scada_lts/web/mvc/api/ReportsApiService.java
index ae3df63b11..2fe482209a 100644
--- a/src/org/scada_lts/web/mvc/api/ReportsApiService.java
+++ b/src/org/scada_lts/web/mvc/api/ReportsApiService.java
@@ -103,7 +103,7 @@ public ReportVO delete(HttpServletRequest request, String xid, Integer id) {
         if(!reportService.hasReportOwnerPermission(user, report))
             throw new UnauthorizedException(request.getRequestURI());
         try {
-            reportService.deleteReport(report.getId());
+            reportService.deleteReport(report);
         } catch (Exception ex) {
             throw new InternalServerErrorException(ex, request.getRequestURI());
         }
diff --git a/src/org/scada_lts/web/mvc/api/ScriptsAPI.java b/src/org/scada_lts/web/mvc/api/ScriptsAPI.java
index a2274209d2..5972c33dd9 100644
--- a/src/org/scada_lts/web/mvc/api/ScriptsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ScriptsAPI.java
@@ -16,7 +16,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
@@ -35,11 +34,13 @@ public class ScriptsAPI {
 
     private static final Log LOG = LogFactory.getLog(ScriptsAPI.class);
 
-    @Resource
-    private ScriptService scriptService;
+    private final ScriptService scriptService;
+    private final DataPointService dataPointService;
 
-    @Resource
-    private DataPointService dataPointService;
+    public ScriptsAPI(ScriptService scriptService, DataPointService dataPointService) {
+        this.scriptService = scriptService;
+        this.dataPointService = dataPointService;
+    }
 
     /**
      * Get Scripts related to specific Data Point
@@ -155,14 +156,16 @@ public ResponseEntity<Map<String, Object>> saveScript(@RequestBody JsonScript js
     }
 
     @PutMapping(value = "/update")
-    public ResponseEntity<String> updateScript(@RequestBody JsonScript jsonBodyRequest, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> updateScript(@RequestBody JsonScript jsonBodyRequest, HttpServletRequest request) {
         LOG.info("PUT::/api/scripts/update");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateScriptUpdate(jsonBodyRequest);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 return findAndUpdateScript(jsonBodyRequest);
             } else {
@@ -187,22 +190,28 @@ public ResponseEntity<String> getUniqueXid(HttpServletRequest request) {
         }
     }
 
-    private ResponseEntity<String> findAndUpdateScript(JsonScript body) {
+    private ResponseEntity<Map<String, String>> findAndUpdateScript(JsonScript body) {
+        Map<String, String> errors = new HashMap<>();
+        errors.put("errors", "Script not found");
         return getScript(body.getId(), scriptService).map(toUpdate -> updateScriptBody(toUpdate, body))
-                .orElse(new ResponseEntity<>(formatErrorsJson("Script not found"), HttpStatus.NOT_FOUND));
+                .orElse(new ResponseEntity<>(errors, HttpStatus.NOT_FOUND));
     }
 
-    private ResponseEntity<String> updateScriptBody(ContextualizedScriptVO toUpdate, JsonScript body) {
+    private ResponseEntity<Map<String, String>> updateScriptBody(ContextualizedScriptVO toUpdate, JsonScript body) {
+        Map<String, String> response = new HashMap<>();
         if (isXidChanged(toUpdate.getXid(), body.getXid()) &&
-                isScriptPresent(body.getXid(), scriptService)){
-            return new ResponseEntity<>(formatErrorsJson("This XID is already in use"), HttpStatus.BAD_REQUEST);
+                isScriptPresent(body.getXid(), scriptService)) {
+            response.put("errors", "This XID is already in use");
+            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
         }
         String pointsError = validatePointsOnContext(body.getPointsOnContext(), dataPointService);
         if (!pointsError.isEmpty()) {
-            return new ResponseEntity<>(formatErrorsJson(pointsError), HttpStatus.NOT_FOUND);
+            response.put("errors", pointsError);
+            return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
         }
         updateValueScript(toUpdate, body, dataPointService);
         scriptService.saveScript(toUpdate);
-        return new ResponseEntity<>("{\"status\":\"updated\"}", HttpStatus.OK);
+        response.put("status", "updated");
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/SystemSettingsAPI.java b/src/org/scada_lts/web/mvc/api/SystemSettingsAPI.java
index edf8682488..5f3568779f 100644
--- a/src/org/scada_lts/web/mvc/api/SystemSettingsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/SystemSettingsAPI.java
@@ -1,10 +1,7 @@
 package org.scada_lts.web.mvc.api;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
-import com.serotonin.mango.web.mvc.controller.ControllerUtils;
 import com.serotonin.mango.web.mvc.controller.ScadaLocaleUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -17,10 +14,11 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Controller for SystemSettings page
@@ -34,24 +32,20 @@ public class SystemSettingsAPI {
     private static final Log LOG = LogFactory.getLog(SystemSettingsAPI.class);
 
     private static final String SAVED_MSG = "saved";
+    private final SystemSettingsService systemSettingsService;
 
-    @Resource
-    private SystemSettingsService systemSettingsService;
+    public SystemSettingsAPI(SystemSettingsService systemSettingsService) {
+        this.systemSettingsService = systemSettingsService;
+    }
 
     @RequestMapping(value = "/getSettings", method = RequestMethod.GET)
-    public ResponseEntity<String> getSettings(HttpServletRequest request) {
+    public ResponseEntity<Map<String, Object>> getSettings(HttpServletRequest request) {
         LOG.info("/api/systemSettings/getSettings");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                ObjectMapper mapper = new ObjectMapper();
-                try {
-                    String json = mapper.writeValueAsString(systemSettingsService.getSettings());
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.FORBIDDEN);
-                }
+                Map<String, Object> response = systemSettingsService.getSettings();
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -62,19 +56,13 @@ public ResponseEntity<String> getSettings(HttpServletRequest request) {
     }
 
     @GetMapping(value = "/getDefaultLoggingType", produces = "application/json")
-    public ResponseEntity<String> getLoggingType(HttpServletRequest request) {
+    public ResponseEntity<Map<String, Object>> getLoggingType(HttpServletRequest request) {
         LOG.info("/api/systemSettings/getDefaultLoggingType");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                ObjectMapper mapper = new ObjectMapper();
-                try {
-                    String json = mapper.writeValueAsString(systemSettingsService.getDefaultLoggingType());
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-                }
+                Map<String, Object> response = systemSettingsService.getDefaultLoggingType();
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -192,13 +180,13 @@ public ResponseEntity<String> saveSMSDomainPost(HttpServletRequest request, @Req
     }
 
     @GetMapping(value = "/sendTestEmail", produces = "application/json")
-    public ResponseEntity<String> sendTestEmail(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> sendTestEmail(HttpServletRequest request) {
         LOG.info("/api/systemSettings/sendTestEmail");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
                 try {
-                    String response = systemSettingsService.sendTestEmail(user);
+                    Map<String, String> response = systemSettingsService.sendTestEmailMap(user);
                     return new ResponseEntity<>(response, HttpStatus.OK);
                 } catch (Exception e) {
                     LOG.error(e);
@@ -314,14 +302,16 @@ public ResponseEntity<String> saveDataRetention(HttpServletRequest request, @Req
     }
 
     @GetMapping(value = "/purgeNow", produces = "application/json")
-    public ResponseEntity<String> purgeNow(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> purgeNow(HttpServletRequest request) {
         LOG.info("/api/systemSettings/purgeData");
         LOG.warn("Purging data!");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
+                Map<String, String> response = new HashMap<>();
                 systemSettingsService.purgeNow();
-                return new ResponseEntity<>("{\"status\": \"done\"}", HttpStatus.OK);
+                response.put("status", "done");
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -442,13 +432,14 @@ public ResponseEntity<String> saveSystemInfo(HttpServletRequest request, HttpSer
     }
 
     @GetMapping(value = "/getDatabaseType", produces = "application/json")
-    public ResponseEntity<String> getDatabaseType(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> getDatabaseType(HttpServletRequest request) {
         LOG.info("/api/systemSettings/getDatabaseType");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                String json = "{\"databaseType\":\"" + systemSettingsService.getDatabaseType() + "\"}";
-                return new ResponseEntity<>(json, HttpStatus.OK);
+                Map<String, String> response = new HashMap<>();
+                response.put("databaseType", systemSettingsService.getDatabaseType());
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -476,19 +467,13 @@ public ResponseEntity<String> saveDatabaseType(HttpServletRequest request, @Path
     }
 
     @GetMapping(value = "/getDatabaseSize", produces = "application/json")
-    public ResponseEntity<String> getDatabaseSize(HttpServletRequest request) {
+    public ResponseEntity<Map<String, Object>> getDatabaseSize(HttpServletRequest request) {
         LOG.info("/api/systemSettings/getDatabaseSize");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                ObjectMapper mapper = new ObjectMapper();
-                try {
-                    String json = mapper.writeValueAsString(systemSettingsService.getDatabaseSize());
-                    return new ResponseEntity<>(json, HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    LOG.error(e);
-                    return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
-                }
+                Map<String, Object> response = systemSettingsService.getDatabaseSize();
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -499,14 +484,16 @@ public ResponseEntity<String> getDatabaseSize(HttpServletRequest request) {
     }
 
     @GetMapping(value = "/purgeData", produces = "application/json")
-    public ResponseEntity<String> purgeData(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> purgeData(HttpServletRequest request) {
         LOG.info("/api/systemSettings/purgeData");
         LOG.warn("Purging data!");
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
                 systemSettingsService.purgeAllData();
-                return new ResponseEntity<>("{\"status\": \"done\"}", HttpStatus.OK);
+                Map<String, String> response = new HashMap<>();
+                response.put("status", "done");
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -517,13 +504,13 @@ public ResponseEntity<String> purgeData(HttpServletRequest request) {
     }
 
     @GetMapping(value = "/getStartupTime", produces = "application/json")
-    public ResponseEntity<String> getStartupTime(HttpServletRequest request) {
+    public ResponseEntity<Map<String, Object>> getStartupTime(HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                return new ResponseEntity<>(
-                        "{\"startupTime\": \"" + systemSettingsService.getStartupTime() + "\"}",
-                        HttpStatus.OK);
+                Map<String, Object> response = new HashMap<>();
+                response.put("startupTime", systemSettingsService.getStartupTime());
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -534,13 +521,13 @@ public ResponseEntity<String> getStartupTime(HttpServletRequest request) {
     }
 
     @GetMapping(value = "/getSchemaVersion", produces = "application/json")
-    public ResponseEntity<String> getSchemaVersion(HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> getSchemaVersion(HttpServletRequest request) {
         try {
             User user = Common.getUser(request);
             if (user != null && user.isAdmin()) {
-                return new ResponseEntity<>(
-                        "{\"schemaVersion\": \"" + systemSettingsService.getSchemaVersion() + "\"}",
-                        HttpStatus.OK);
+                Map<String, String> response = new HashMap<>();
+                response.put("schemaVersion", systemSettingsService.getSchemaVersion());
+                return new ResponseEntity<>(response, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
diff --git a/src/org/scada_lts/web/mvc/api/TranslateAPI.java b/src/org/scada_lts/web/mvc/api/TranslateAPI.java
index dea9032107..903a337698 100644
--- a/src/org/scada_lts/web/mvc/api/TranslateAPI.java
+++ b/src/org/scada_lts/web/mvc/api/TranslateAPI.java
@@ -11,6 +11,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+@Deprecated(since = "2.8.0")
 public class TranslateAPI {
 	
 	private static final Log LOG = LogFactory.getLog(TranslateAPI.class);
diff --git a/src/org/scada_lts/web/mvc/api/UserCommentAPI.java b/src/org/scada_lts/web/mvc/api/UserCommentAPI.java
index 8e2a390c28..5992f4992b 100644
--- a/src/org/scada_lts/web/mvc/api/UserCommentAPI.java
+++ b/src/org/scada_lts/web/mvc/api/UserCommentAPI.java
@@ -6,14 +6,15 @@
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.mango.service.UserCommentService;
 import org.scada_lts.web.beans.ApplicationBeans;
-import org.scada_lts.web.mvc.api.json.JsonEventComment;
+import org.scada_lts.web.mvc.api.json.JsonUserComment;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
 import static org.scada_lts.utils.UserCommentApiUtils.validUserComment;
 import static org.scada_lts.utils.UserCommentApiUtils.validUserCommentWithTs;
@@ -35,27 +36,27 @@ public UserCommentAPI() {
      * Create User Comment
      *
      * @param request HTTP request
-     * @param body String comment
+     * @param createUserComment String comment
      * @param typeId UserComment type (1 - Event or 2 - Point)
      * @param refId Reference ID of the object
      *
      * @return Status
      */
     @PostMapping(value = "/{typeId}/{refId}")
-    public ResponseEntity<String> createUserComment(HttpServletRequest request, @RequestBody JsonEventComment comment, @PathVariable("typeId") Integer typeId, @PathVariable("refId") Integer refId) {
+    public ResponseEntity<?> createUserComment(HttpServletRequest request, @Valid @RequestBody CreateUserComment createUserComment, @PathVariable("typeId") Integer typeId, @PathVariable("refId") Integer refId) {
         try {
             User user = Common.getUser(request);
             if(user != null) {
-                String error = validUserComment(typeId, refId, comment.getCommentText());
+                String error = validUserComment(typeId, refId, createUserComment.getCommentText());
                 if (!error.isEmpty()) {
                     return ResponseEntity.badRequest().body(formatErrorsJson(error));
                 }
-                int result = userCommentService.setUserComment(comment.getCommentText(), typeId, refId, user);
-                if(result != 0) {
-                    return new ResponseEntity<>(String.valueOf(result), HttpStatus.CREATED);
-                } else {
-                    return new ResponseEntity<>(String.valueOf(result), HttpStatus.BAD_REQUEST);
-                }
+                return userCommentService.addUserComment(createUserComment.getCommentText(), typeId, refId, user).map(a -> {
+                            JsonUserComment comment = new JsonUserComment(a.getUserId(), typeId, a.getTypeKey(),
+                                    a.getTs(), a.getComment(), a.getUsername(), a.getPrettyTime());
+                            return new ResponseEntity<>(comment, HttpStatus.CREATED);
+                        })
+                        .orElseGet(() -> new ResponseEntity<>(HttpStatus.BAD_REQUEST));
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -97,4 +98,25 @@ public ResponseEntity<String> deleteUserComment(HttpServletRequest request, @Pat
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
+
+    static class CreateUserComment {
+
+        @XssProtect
+        private String commentText;
+
+        public CreateUserComment() {
+        }
+
+        public CreateUserComment(String commentText) {
+            this.commentText = commentText;
+        }
+
+        public String getCommentText() {
+            return commentText;
+        }
+
+        public void setCommentText(String commentText) {
+            this.commentText = commentText;
+        }
+    }
 }
diff --git a/src/org/scada_lts/web/mvc/api/UtilsAPI.java b/src/org/scada_lts/web/mvc/api/UtilsAPI.java
index 4dd29641b4..b90af0e40f 100644
--- a/src/org/scada_lts/web/mvc/api/UtilsAPI.java
+++ b/src/org/scada_lts/web/mvc/api/UtilsAPI.java
@@ -17,7 +17,6 @@
  */
 package org.scada_lts.web.mvc.api;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
@@ -28,7 +27,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * Controller for API watchList
@@ -40,22 +38,22 @@ public class UtilsAPI {
 	
 	private static final Log LOG = LogFactory.getLog(UtilsAPI.class);
 
-	@Resource
-	private UtilsService utilsService;
+	private final UtilsService utilsService;
+
+	public UtilsAPI(UtilsService utilsService) {
+		this.utilsService = utilsService;
+	}
 
 	@RequestMapping(value = "/api/utils/getTs", method = RequestMethod.GET)
 	public ResponseEntity<String> getTs(HttpServletRequest request) {
 		LOG.info("/api/utils/getTs");
 		try {
-			String json = null;
-			ObjectMapper mapper = new ObjectMapper();
-			json = mapper.writeValueAsString(utilsService.getTS());
-				
-			return new ResponseEntity<String>(json,HttpStatus.OK);				
+			long ts = utilsService.getTS();
+			return new ResponseEntity<>(String.valueOf(ts),HttpStatus.OK);
 
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 	}
 }
diff --git a/src/org/scada_lts/web/mvc/api/ViewAPI.java b/src/org/scada_lts/web/mvc/api/ViewAPI.java
index f68470e5fe..7d14cb9d56 100644
--- a/src/org/scada_lts/web/mvc/api/ViewAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ViewAPI.java
@@ -17,8 +17,8 @@
  */
 package org.scada_lts.web.mvc.api;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
+import com.serotonin.mango.util.LoggingUtils;
 import com.serotonin.mango.view.ImageSet;
 import com.serotonin.mango.view.View;
 import com.serotonin.mango.vo.User;
@@ -39,7 +39,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.Serializable;
@@ -86,101 +85,36 @@ public ResponseEntity<List<ScadaObjectIdentifier>> getAll(HttpServletRequest req
     }
 
     @RequestMapping(value = "/getModificationTime/{id}", method = RequestMethod.GET)
-    public ResponseEntity<String> getModificationTime(@PathVariable("id") Integer id, HttpServletRequest request) {
+    public ResponseEntity<ViewJSON> getModificationTime(@PathVariable("id") Integer id, HttpServletRequest request) {
         LOG.info("/api/view/getModificationTime/{id} id:"+id);
 
         try {
             User user = Common.getUser(request);
 
             if (user != null) {
-                class ViewJSON implements Serializable {
-                    private long id;
-                    private long mtime;
-
-                    ViewJSON(long id, long mtime) {
-                        this.setId(id);
-                        this.setMtime(mtime);
-                    }
-
-                    public long getId() {
-                        return id;
-                    }
-
-                    public void setId(long id) {
-                        this.id = id;
-                    }
-
-                    public long getMtime() {
-                        return mtime;
-                    }
-
-                    public void setMtime(long mtime) {
-                        this.mtime = mtime;
-                    }
-                }
 
                 View view = viewService.getView(id);
-
                 ViewJSON viewJSON = new ViewJSON(view.getId(), view.getModificationTime());
-
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(viewJSON);
-
-                return new ResponseEntity<String>(json, HttpStatus.OK);
+                return new ResponseEntity<>(viewJSON, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 
     @Deprecated
     @RequestMapping(value = "/getByXid/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getByXid(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<ViewJSON> getByXid(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/view/getByXid/{xid} xid:"+xid);
 
         try {
             User user = Common.getUser(request);
 
             if (user != null) {
-                class ViewJSON implements Serializable {
-                    private long id;
-                    private String xid;
-                    private long mtime;
-
-                    ViewJSON(long id, String xid, long mtime) {
-                        this.setId(id);
-                        this.setXid(xid);
-                        this.setMtime(mtime);
-                    }
 
-                    public long getId() {
-                        return id;
-                    }
-
-                    public void setId(long id) {
-                        this.id = id;
-                    }
-
-                    public String getXid() {
-                        return xid;
-                    }
-
-                    public void setXid(String xid) {
-                        this.xid = xid;
-                    }
-
-                    public long getMtime() {
-                        return mtime;
-                    }
-
-                    public void setMtime(long mtime) {
-                        this.mtime = mtime;
-                    }
-                }
 
                 View view;
                 if (user.isAdmin()) {
@@ -189,14 +123,8 @@ public void setMtime(long mtime) {
                     return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
                 }
 
-
                 ViewJSON viewJSON = new ViewJSON(view.getId(), view.getXid(), view.getModificationTime());
-
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(viewJSON);
-
-                return new ResponseEntity<>(json, HttpStatus.OK);
+                return new ResponseEntity<>(viewJSON, HttpStatus.OK);
             }
 
             return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -208,78 +136,21 @@ public void setMtime(long mtime) {
 
     @Deprecated
     @RequestMapping(value = "/createView", method = RequestMethod.POST)
-    public ResponseEntity<String> createView(HttpServletRequest request, @RequestBody ViewDTO viewDTO) {
+    public ResponseEntity<ViewJSON> createView(HttpServletRequest request, @RequestBody ViewDTO viewDTO) {
         LOG.info("/api/view/createView");
 
-        ResponseEntity<String> result;
+        ResponseEntity<ViewJSON> result;
         ViewDTOValidator validator = new ViewDTOValidator();
 
         BindException errors = new BindException(viewDTO, "viewDTO");
         validator.validate(viewDTO, errors);
 
-
         try {
-            class ViewJSON implements Serializable {
-                private static final long serialVersionUID = 8076556272526329317L;
-                private String name;
-                private String xid;
-                private int userId;
-                private int resolution;
-                private String filename;
-
-                public ViewJSON(String name, String xid, int userId, int resolution, String filename) {
-                    this.name = name;
-                    this.xid = xid;
-                    this.userId = userId;
-                    this.resolution = resolution;
-                    this.filename = filename;
-                }
-
-                public String getName() {
-                    return name;
-                }
-
-                public void setName(String name) {
-                    this.name = name;
-                }
-
-                public String getXid() {
-                    return xid;
-                }
-
-                public void setXid(String xid) {
-                    this.xid = xid;
-                }
-
-                public int getUserId() {
-                    return userId;
-                }
-
-                public void setUserId(int userId) {
-                    this.userId = userId;
-                }
-
-                public int getResolution() {
-                    return resolution;
-                }
-
-                public void setResolution(int resolution) {
-                    this.resolution = resolution;
-                }
-
-                public String getFilename() {
-                    return filename;
-                }
-
-                public void setFilename(String filename) {
-                    this.filename = filename;
-                }
-            }
 
             User user = Common.getUser(request);
 
             if (!errors.hasErrors()) {
-                if (user.isAdmin()) {
+                if (user != null && user.isAdmin()) {
 
                     View view = new View();
                     view.setName(viewDTO.getName());
@@ -294,8 +165,6 @@ public void setFilename(String filename) {
 
                     viewService.saveView(view);
 
-                    ObjectMapper mapper = new ObjectMapper();
-                    String json = null;
                     ViewJSON viewJSON = new ViewJSON(
                             view.getName(),
                             view.getXid(),
@@ -304,19 +173,17 @@ public void setFilename(String filename) {
                             view.getBackgroundFilename()
                     );
 
-                    json = mapper.writeValueAsString(viewJSON);
-
-                    result = new ResponseEntity<String>(json, HttpStatus.OK);
+                    result = new ResponseEntity<>(viewJSON, HttpStatus.OK);
                 } else {
-                    result = new ResponseEntity<String>("Acces unauthorized, logged user has no admin permissions ",HttpStatus.UNAUTHORIZED);
+                    result = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
                 }
             } else {
-                result = new ResponseEntity<String>("Invalid arguments in JSON file " , HttpStatus.UNPROCESSABLE_ENTITY);
+                result = new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
             }
 
         } catch (Exception e) {
             LOG.error(e);
-            result = new ResponseEntity<String>("Something went wrong ",HttpStatus.BAD_REQUEST);
+            result = new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
         return result;
 
@@ -397,14 +264,16 @@ public ResponseEntity<Map<String, String>> createView(@RequestBody GraphicalView
     }
 
     @PutMapping(value = "")
-    public ResponseEntity<String> updateView(@RequestBody GraphicalViewDTO viewDTO, HttpServletRequest request) {
+    public ResponseEntity<Map<String, String>> updateView(@RequestBody GraphicalViewDTO viewDTO, HttpServletRequest request) {
         LOG.info("/api/view");
         try {
             User user = Common.getUser(request);
             if (user != null) {
+                Map<String, String> response = new HashMap<>();
                 String error = validateGraphicalViewUpdate(viewDTO, user);
                 if (!error.isEmpty()) {
-                    return ResponseEntity.badRequest().body(formatErrorsJson(error));
+                    response.put("errors", error);
+                    return ResponseEntity.badRequest().body(response);
                 }
                 return findAndUpdateView(viewDTO, user);
             } else {
@@ -549,26 +418,101 @@ public ResponseEntity<Map<String, Object>> isXidUnique(
         }
     }
 
-    private ResponseEntity<String> findAndUpdateView(GraphicalViewDTO body, User user) {
+    private ResponseEntity<Map<String, String>> findAndUpdateView(GraphicalViewDTO body, User user) {
+        Map<String, String> errors = new HashMap<>();
+        errors.put("errors", "View not found");
         return getGraphicalView(body.getId(), viewService)
                 .filter(a -> GetViewsWithAccess.hasViewOwnerPermission(user, a))
                 .map(toUpdate -> updateGraphicalView(toUpdate, body, user)).
-                orElse(new ResponseEntity<>(formatErrorsJson("View not found"), HttpStatus.NOT_FOUND));
+                orElse(new ResponseEntity<>(errors, HttpStatus.NOT_FOUND));
     }
 
-    private ResponseEntity<String> updateGraphicalView(View toUpdate, GraphicalViewDTO body, User user) {
+    private ResponseEntity<Map<String, String>> updateGraphicalView(View toUpdate, GraphicalViewDTO body, User user) {
+        Map<String, String> response = new HashMap<>();
         if (isXidChanged(toUpdate.getXid(), body.getXid()) &&
                 isViewPresent(body.getXid(), viewService)){
-            return new ResponseEntity<>(formatErrorsJson("This XID is already in use"), HttpStatus.BAD_REQUEST);
+            response.put("errors", "This XID is already in use");
+            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
         }
         updateValueGraphicalView(toUpdate, body, user);
         try {
             viewService.saveViewAPI(toUpdate);
         } catch (IOException e) {
-            e.printStackTrace();
-            return new ResponseEntity<>("Saving failed", HttpStatus.INTERNAL_SERVER_ERROR);
+            LOG.error(LoggingUtils.exceptionInfo(e));
+            response.put("errors", "Saving failed");
+            return new ResponseEntity<>(response, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        return new ResponseEntity<>("{\"status\":\"updated\"}", HttpStatus.OK);
+        response.put("status", "updated");
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
+    static class ViewJSON implements Serializable {
+        private static final long serialVersionUID = 8076556272526329317L;
+        private String name;
+        private long id;
+        private String xid;
+        private int userId;
+        private int resolution;
+        private String filename;
+        private long mtime;
+
+        ViewJSON(long id, long mtime) {
+            this.id = id;
+            this.mtime = mtime;
+        }
+
+        ViewJSON(long id, String xid, long mtime) {
+            this.id = id;
+            this.xid = xid;
+            this.mtime = mtime;
+        }
+
+        public ViewJSON(String name, String xid, int userId, int resolution, String filename) {
+            this.name = name;
+            this.xid = xid;
+            this.userId = userId;
+            this.resolution = resolution;
+            this.filename = filename;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getXid() {
+            return xid;
+        }
+
+        public void setXid(String xid) {
+            this.xid = xid;
+        }
+
+        public int getUserId() {
+            return userId;
+        }
+
+        public void setUserId(int userId) {
+            this.userId = userId;
+        }
+
+        public int getResolution() {
+            return resolution;
+        }
+
+        public void setResolution(int resolution) {
+            this.resolution = resolution;
+        }
+
+        public String getFilename() {
+            return filename;
+        }
+
+        public void setFilename(String filename) {
+            this.filename = filename;
+        }
+    }
 }
diff --git a/src/org/scada_lts/web/mvc/api/ViewComponentAPI.java b/src/org/scada_lts/web/mvc/api/ViewComponentAPI.java
index 36a64837a4..312df38d6e 100644
--- a/src/org/scada_lts/web/mvc/api/ViewComponentAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ViewComponentAPI.java
@@ -1,7 +1,6 @@
 package org.scada_lts.web.mvc.api;
 
 import br.org.scadabr.view.component.LinkComponent;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.view.ImageSet;
 import com.serotonin.mango.view.View;
@@ -20,7 +19,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,17 +32,19 @@ public class ViewComponentAPI {
 
     private static final Log LOG = LogFactory.getLog(ViewComponentAPI.class);
 
-    @Resource
-    ViewService viewService;
+    private final ViewService viewService;
+    private final DataPointService dataPointService;
 
-    @Resource
-    DataPointService dataPointService;
+    public ViewComponentAPI(ViewService viewService, DataPointService dataPointService) {
+        this.viewService = viewService;
+        this.dataPointService = dataPointService;
+    }
 
     @RequestMapping(value = "/api/component/getAllComponentsFromView/{xid}", method = RequestMethod.GET)
-    public ResponseEntity<String> getAllComponentsFromView(@PathVariable("xid") String xid, HttpServletRequest request) {
+    public ResponseEntity<List<ViewComponentDTO>> getAllComponentsFromView(@PathVariable("xid") String xid, HttpServletRequest request) {
         LOG.info("/api/component/addComponentToView/{xid} xid:" + xid);
 
-        ResponseEntity<String> result;
+        ResponseEntity<List<ViewComponentDTO>> result;
 
         try {
             User user = Common.getUser(request);
@@ -60,17 +60,13 @@ public ResponseEntity<String> getAllComponentsFromView(@PathVariable("xid") Stri
                     ViewComponentDTO viewComponentDTO = new ViewComponentDTO(vc.getId(), vc.getIndex(), vc.getDefName(), vc.getIdSuffix(), vc.getStyle(), vc.getX(), vc.getY());
                     viewComponentDTOList.add(viewComponentDTO);
                 }
-
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(viewComponentDTOList);
-                result = new ResponseEntity<String>(json, HttpStatus.OK);
+                result = new ResponseEntity<>(viewComponentDTOList, HttpStatus.OK);
             } else {
-                result = new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+                result = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
         } catch (Exception e) {
             LOG.error(e);
-            result = new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            result = new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
 
         return result;
diff --git a/src/org/scada_lts/web/mvc/api/ViewHierarchyAPI.java b/src/org/scada_lts/web/mvc/api/ViewHierarchyAPI.java
index 9ceb4946ae..84eadb4853 100644
--- a/src/org/scada_lts/web/mvc/api/ViewHierarchyAPI.java
+++ b/src/org/scada_lts/web/mvc/api/ViewHierarchyAPI.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
@@ -32,6 +31,7 @@
 import org.scada_lts.dao.model.viewshierarchy.ViewHierarchyNode;
 import org.scada_lts.service.ViewHierarchyService;
 import org.scada_lts.service.model.ViewHierarchyJSON;
+import org.scada_lts.web.mvc.api.exceptions.BadRequestException;
 import org.springframework.context.MessageSource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -40,7 +40,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 
@@ -53,42 +52,38 @@
 public class ViewHierarchyAPI {
 	
 	private static final Log LOG = LogFactory.getLog(ViewHierarchyAPI.class);
-	
-	@Resource
-	private ViewHierarchyService viewHierarchyService;
-	
-	@Resource
-	private MessageSource msgSource;
 
-	
+	private final ViewHierarchyService viewHierarchyService;
+	private final MessageSource msgSource;
+
+	public ViewHierarchyAPI(ViewHierarchyService viewHierarchyService, MessageSource msgSource) {
+		this.viewHierarchyService = viewHierarchyService;
+		this.msgSource = msgSource;
+	}
+
 	@RequestMapping(value = "/api/view_hierarchy/getAll", method = RequestMethod.GET)
-	public ResponseEntity<String> getAll(HttpServletRequest request) {
+	public ResponseEntity<List<ViewHierarchyJSON>> getAll(HttpServletRequest request) {
 		LOG.info("/api/view_hierarchy/getAll");
 		try {
 			User user = Common.getUser(request);
 		
 			if (user != null) {
 				List<ViewHierarchyJSON> data = ViewHierarchyCache.getInstance().getAll();
-				String json = null;
-				ObjectMapper mapper = new ObjectMapper();
-				
-				json = mapper.writeValueAsString(data);
-				
-				return new ResponseEntity<String>(json,HttpStatus.OK);				
+				return new ResponseEntity<>(data,HttpStatus.OK);
 			} 
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 			
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(e.toString(), HttpStatus.BAD_REQUEST);
+			throw new BadRequestException(e.toString(), request.getRequestURI());
 		}
 	}
 	
 		
 	
 	@RequestMapping(value = "/api/view_hierarchy/createFolder/{name}/{parentId}", method = RequestMethod.GET)
-	public ResponseEntity<String> createFolder(@PathVariable("name") String name, @PathVariable("parentId") int parentId, HttpServletRequest request) {
+	public ResponseEntity<Object> createFolder(@PathVariable("name") String name, @PathVariable("parentId") int parentId, HttpServletRequest request) {
 		
 		LOG.info("/api/view_hierarchy/createFolder/{name}:"+name+" {parentId}:"+parentId);
 		
@@ -99,14 +94,9 @@ public ResponseEntity<String> createFolder(@PathVariable("name") String name, @P
 					ViewHierarchyNode node = new ViewHierarchyNode(parentId, name);
 					viewHierarchyService.add(node);
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString(node);
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>(node,HttpStatus.OK);
 				} catch ( Exception error) {
 					LOG.error(error);
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
 					ViewError er = new ViewError();
 					
 					ParseErrorResult per = ParseError.getError(error.getLocalizedMessage());
@@ -117,21 +107,20 @@ public ResponseEntity<String> createFolder(@PathVariable("name") String name, @P
 						errStr = per.getMessage();
 					}
 					er.setMessage(errStr);
-					json = mapper.writeValueAsString(er);
-					return new ResponseEntity<String>(json,HttpStatus.BAD_REQUEST);
+					return new ResponseEntity<>(er,HttpStatus.BAD_REQUEST);
 				} 
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 			
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 	}
 	
 	@RequestMapping(value = "/api/view_hierarchy/editFolder/{name}/{key}", method = RequestMethod.GET)
-	public ResponseEntity<String> editFolder(@PathVariable("name") String name, @PathVariable("key") int key, HttpServletRequest request) {
+	public ResponseEntity<ViewHierarchyNode> editFolder(@PathVariable("name") String name, @PathVariable("key") int key, HttpServletRequest request) {
 		
 		LOG.info("/api/view_hierarchy/editFolder/{name}:"+name+" {key}:"+key);
 		
@@ -144,19 +133,16 @@ public ResponseEntity<String> editFolder(@PathVariable("name") String name, @Pat
 				
 				if (viewHierarchyService.edt(node)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString(node);
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>(node,HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 			
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 	}
 	
@@ -171,19 +157,16 @@ public ResponseEntity<String> deleteFolder(@PathVariable("id") int id, HttpServl
 				
 				if (viewHierarchyService.delFolder(id)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString("success");
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>("success",HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 		
 	}
@@ -199,19 +182,16 @@ public ResponseEntity<String> deleteView(@PathVariable("id") int id, HttpServlet
 				
 				if (viewHierarchyService.delView(id)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString("success");
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>("success",HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 		
 	}
@@ -227,15 +207,12 @@ public ResponseEntity<String> moveFolder(@PathVariable("id") int id, @PathVariab
 				
 				if (viewHierarchyService.moveFolder(id, newParentId)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString("moved");
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>("moved",HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
@@ -255,42 +232,38 @@ public ResponseEntity<String> moveView(@PathVariable("id") int id, @PathVariable
 				
 				if (viewHierarchyService.moveView(id, newParentId)) {
 					ViewHierarchyCache.getInstance().refresh();
-					String json = null;
-					ObjectMapper mapper = new ObjectMapper();
-					json = mapper.writeValueAsString("moved");
-					return new ResponseEntity<String>(json,HttpStatus.OK);
+					return new ResponseEntity<>("moved",HttpStatus.OK);
 				}
-				return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+				return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 		
 	}
 	
 	@RequestMapping(value = "/api/view_hierarchy/getFirstViewId", method = RequestMethod.GET)
-	public ResponseEntity<String> getFirstViewId(HttpServletRequest request) {
+	public ResponseEntity<ViewHierarchyJSON> getFirstViewId(HttpServletRequest request) {
 		
 		LOG.info("/api/view_hierarchy/getFirstViewId");
 		
 		try {
 			User user = Common.getUser(request);
 			if (user != null) {
-				String json = null;
-				ObjectMapper mapper = new ObjectMapper();
-				json = mapper.writeValueAsString(viewHierarchyService.getFirstViewId());
-				return new ResponseEntity<String>(json,HttpStatus.OK);
+
+				ViewHierarchyJSON response = viewHierarchyService.getFirstViewId();
+				return new ResponseEntity<>(response,HttpStatus.OK);
 			}
 			
-			return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		
 		} catch (Exception e) {
 			LOG.error(e);
-			return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 		}
 		
 	}
diff --git a/src/org/scada_lts/web/mvc/api/components/AmChartValuesAPI.java b/src/org/scada_lts/web/mvc/api/components/AmChartValuesAPI.java
index 02013b82d7..b2ca78245d 100644
--- a/src/org/scada_lts/web/mvc/api/components/AmChartValuesAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/AmChartValuesAPI.java
@@ -29,8 +29,13 @@
 public class AmChartValuesAPI {
     private static final Log LOG = LogFactory.getLog(AmChartValuesAPI.class);
 
-    private static final DataPointService dpService = new DataPointService();
-    private static final SystemSettingsService systemSettingsService = new SystemSettingsService();
+    private final DataPointService dpService;
+    private final SystemSettingsService systemSettingsService;
+
+    public AmChartValuesAPI(DataPointService dpService, SystemSettingsService systemSettingsService) {
+        this.dpService = dpService;
+        this.systemSettingsService = systemSettingsService;
+    }
 
     @GetMapping("/")
     public ResponseEntity<List<Map<String, Double>>> getValuesFromTimeRange(
diff --git a/src/org/scada_lts/web/mvc/api/components/cmp/ChangeDataAPI.java b/src/org/scada_lts/web/mvc/api/components/cmp/ChangeDataAPI.java
index 1724b2956d..1878499b49 100644
--- a/src/org/scada_lts/web/mvc/api/components/cmp/ChangeDataAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/cmp/ChangeDataAPI.java
@@ -6,10 +6,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.mango.service.DataPointService;
-import org.scada_lts.mango.service.PointValueService;
 import org.scada_lts.service.MultiChangesHistoryService;
 import org.scada_lts.web.mvc.api.components.cmp.model.SetValuePointDTO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -18,7 +16,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -28,15 +25,13 @@
 public class ChangeDataAPI {
     private static final Log LOG = LogFactory.getLog(ChangeDataAPI.class);
 
-    @Autowired
-    private DataPointService dataPointService;
-
-    @Resource
-    private PointValueService pointValueService;
-
-    @Resource
-    private MultiChangesHistoryService multiChangesHistoryService;
+    private final DataPointService dataPointService;
+    private final MultiChangesHistoryService multiChangesHistoryService;
 
+    public ChangeDataAPI(DataPointService dataPointService, MultiChangesHistoryService multiChangesHistoryService) {
+        this.dataPointService = dataPointService;
+        this.multiChangesHistoryService = multiChangesHistoryService;
+    }
 
     @RequestMapping(value = "/api/cmp/set/{xIdViewAndIdCmp}/{interpretedState}", method = RequestMethod.POST)
     public ResponseEntity<SetValuePointDTO[]> set(
diff --git a/src/org/scada_lts/web/mvc/api/components/cmp/GetHistoryChangesAPI.java b/src/org/scada_lts/web/mvc/api/components/cmp/GetHistoryChangesAPI.java
index e9cc269068..cfd67d777b 100644
--- a/src/org/scada_lts/web/mvc/api/components/cmp/GetHistoryChangesAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/cmp/GetHistoryChangesAPI.java
@@ -13,7 +13,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -23,9 +22,12 @@
 public class GetHistoryChangesAPI {
     private static final Log LOG = LogFactory.getLog(GetHistoryChangesAPI.class);
 
-    @Resource
     private MultiChangesHistoryService multiChangesHistoryService;
 
+    public GetHistoryChangesAPI(MultiChangesHistoryService multiChangesHistoryService) {
+        this.multiChangesHistoryService = multiChangesHistoryService;
+    }
+
     @RequestMapping(value = "/api/cmp/history/{xIdViewAndIdCmp}", method = RequestMethod.GET)
     public ResponseEntity<MultiChangeHistoryComponentDTO> getHistory(@PathVariable(name = "xIdViewAndIdCmp") String xidViewAndIdCmp, HttpServletRequest request) {
         LOG.info("/api/cmp/hisotry xidViewAndIdCmp:" + xidViewAndIdCmp);
diff --git a/src/org/scada_lts/web/mvc/api/components/cmp/ReadDataBaseXIdAPI.java b/src/org/scada_lts/web/mvc/api/components/cmp/ReadDataBaseXIdAPI.java
index 0561d79637..ffd0cfe1a0 100644
--- a/src/org/scada_lts/web/mvc/api/components/cmp/ReadDataBaseXIdAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/cmp/ReadDataBaseXIdAPI.java
@@ -16,7 +16,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,9 +29,13 @@ public class ReadDataBaseXIdAPI {
 
     private static final Log LOG = LogFactory.getLog(ReadDataBaseXIdAPI.class);
 
-    private DataPointService dataPointService = new DataPointService();
-    @Resource
-    private PointValueService pointValueService;
+    private final DataPointService dataPointService;
+    private final PointValueService pointValueService;
+
+    public ReadDataBaseXIdAPI(DataPointService dataPointService, PointValueService pointValueService) {
+        this.dataPointService = dataPointService;
+        this.pointValueService = pointValueService;
+    }
 
     @RequestMapping(value = "/api/cmp/get/{xIDs}", method = RequestMethod.GET)
     public ResponseEntity<List<ReadValuePointDTO>> get(@PathVariable(name = "xIDs") String[] xIDs, HttpServletRequest request) {
diff --git a/src/org/scada_lts/web/mvc/api/components/synoptic_panel/SynopticPanelAPI.java b/src/org/scada_lts/web/mvc/api/components/synoptic_panel/SynopticPanelAPI.java
index f9633ecd69..6044b97847 100644
--- a/src/org/scada_lts/web/mvc/api/components/synoptic_panel/SynopticPanelAPI.java
+++ b/src/org/scada_lts/web/mvc/api/components/synoptic_panel/SynopticPanelAPI.java
@@ -5,18 +5,18 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.dao.model.ScadaObjectIdentifier;
+import org.scada_lts.serorepl.utils.StringUtils;
 import org.scada_lts.service.SynopticPanelService;
 import org.scada_lts.service.model.SynopticPanel;
+import org.scada_lts.utils.ValidationUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Controller for Synoptic Panels
@@ -33,8 +33,11 @@ public class SynopticPanelAPI {
 
     private static final Log LOG = LogFactory.getLog(SynopticPanelAPI.class);
 
-    @Resource
-    private SynopticPanelService synopticPanelService;
+    private final SynopticPanelService synopticPanelService;
+
+    public SynopticPanelAPI(SynopticPanelService synopticPanelService) {
+        this.synopticPanelService = synopticPanelService;
+    }
 
     /**
      * Use universal ScadaObjectIdentifier Class
@@ -97,7 +100,12 @@ public ResponseEntity<SynopticPanel> createSynopticPanel(HttpServletRequest requ
         try {
             User user = Common.getUser(request);
             if(user != null) {
-                return new ResponseEntity<>(synopticPanelService.createSynopticPanel(requestBody), HttpStatus.CREATED);
+                String error = ValidationUtils.validSvg(requestBody.getVectorImage());
+                if(!StringUtils.isEmpty(error)) {
+                    return ResponseEntity.badRequest().build();
+                }
+                SynopticPanel result = synopticPanelService.createSynopticPanel(requestBody);
+                return new ResponseEntity<>(result, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
@@ -112,7 +120,12 @@ public ResponseEntity<SynopticPanel> updateSynopticPanel(HttpServletRequest requ
         try {
             User user = Common.getUser(request);
             if (user != null) {
-                return new ResponseEntity<>(synopticPanelService.updateSynopticPanel(requestBody), HttpStatus.OK);
+                String error = ValidationUtils.validSvg(requestBody.getVectorImage());
+                if(!StringUtils.isEmpty(error)) {
+                    return ResponseEntity.badRequest().build();
+                }
+                SynopticPanel result = synopticPanelService.updateSynopticPanel(requestBody);
+                return new ResponseEntity<>(result, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
diff --git a/src/org/scada_lts/web/mvc/api/css/CssStyle.java b/src/org/scada_lts/web/mvc/api/css/CssStyle.java
new file mode 100644
index 0000000000..cfe3b78f4d
--- /dev/null
+++ b/src/org/scada_lts/web/mvc/api/css/CssStyle.java
@@ -0,0 +1,26 @@
+package org.scada_lts.web.mvc.api.css;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.scada_lts.web.beans.validation.css.CssValid;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
+
+public class CssStyle {
+
+    @CssValid @XssProtect
+    private final String content;
+
+    @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+    public CssStyle(@JsonProperty("content") String content) {
+        this.content = CustomCssUtils.replaceToTab(content);
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public CssStyle clearedOfTabs() {
+        return new CssStyle(getContent().replace("\t", " "));
+    }
+}
diff --git a/src/org/scada_lts/web/mvc/api/css/CustomCssUtils.java b/src/org/scada_lts/web/mvc/api/css/CustomCssUtils.java
new file mode 100644
index 0000000000..feb7c0d9c4
--- /dev/null
+++ b/src/org/scada_lts/web/mvc/api/css/CustomCssUtils.java
@@ -0,0 +1,61 @@
+package org.scada_lts.web.mvc.api.css;
+
+import com.serotonin.mango.util.LoggingUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.scada_lts.utils.PathSecureUtils;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class CustomCssUtils {
+
+    private static final Log LOG = LogFactory.getLog(CustomCssUtils.class);
+    private static final String CSS_FILENAME = "/assets/user_styles.css";
+    private static final String TAB = new String(new byte[]{-30, -128, -125}, StandardCharsets.UTF_8);
+
+    public static boolean saveToFile(CssStyle cssStyle) {
+        try {
+            File customCssFile = getCustomCssFileFromPath();
+            if (customCssFile != null) {
+                try (BufferedWriter writer = new BufferedWriter(new FileWriter(customCssFile, StandardCharsets.UTF_8))) {
+                    writer.write(cssStyle.getContent());
+                }
+            }
+            return true;
+        } catch (Exception ex) {
+            LOG.warn(LoggingUtils.exceptionInfo(ex));
+            return false;
+        }
+    }
+
+    private static File getCustomCssFileFromPath() {
+        try {
+            Path path = PathSecureUtils.getAppContextSystemFilePath(CSS_FILENAME);
+            File cssFile = path.toFile();
+            if(Files.exists(path) == Files.notExists(path)) {
+                LOG.warn("Missing file permissions!: " + CSS_FILENAME);
+                return null;
+            }
+            if(Files.notExists(path)) {
+                boolean created = cssFile.createNewFile();
+                if(created) {
+                    LOG.info("Created custom CSS stylesheet file: " + CSS_FILENAME);
+                }
+            }
+            return cssFile;
+        } catch (IOException e) {
+            LOG.warn("Could not create a custom CSS file: " + CSS_FILENAME);
+        }
+        return null;
+    }
+
+    public static String replaceToTab(String content) {
+        return content.replace(TAB, "\t");
+    }
+}
diff --git a/src/org/scada_lts/web/mvc/api/datasources/DataPointJson.java b/src/org/scada_lts/web/mvc/api/datasources/DataPointJson.java
index 88328b3b03..e314671674 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/DataPointJson.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/DataPointJson.java
@@ -1,21 +1,28 @@
 package org.scada_lts.web.mvc.api.datasources;
 
 import com.serotonin.mango.vo.DataPointVO;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 
 import java.util.ArrayList;
 
 public class DataPointJson {
 
     private Integer id;
+    @XssProtect
     private String xid;
+    @XssProtect
     private String name;
+    @XssProtect
     private String description;
     private Boolean enabled;
     private int dataSourceTypeId;
     private int dataSourceId;
+    @XssProtect
     private String deviceName;
     private DataPointLocatorJson pointLocator;
+    @XssProtect
     private String datasourceName;
+    @XssProtect
     private String dataSourceXid;
     private int typeId;
     private Boolean settable;
diff --git a/src/org/scada_lts/web/mvc/api/datasources/DataSourceJson.java b/src/org/scada_lts/web/mvc/api/datasources/DataSourceJson.java
index c994415f60..31e1e66c8a 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/DataSourceJson.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/DataSourceJson.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.serotonin.mango.vo.dataSource.DataSourceVO;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 import org.scada_lts.web.mvc.api.datasources.meta.MetaDataSourceJson;
 import org.scada_lts.web.mvc.api.datasources.modbusip.ModbusIpDataSourceJson;
 import org.scada_lts.web.mvc.api.datasources.snmp.SnmpDataSourceJson;
@@ -22,7 +23,9 @@
 public class DataSourceJson {
 
     private int id;
+    @XssProtect
     private String xid;
+    @XssProtect
     private String name;
     private int type;
 
diff --git a/src/org/scada_lts/web/mvc/api/datasources/meta/MetaController.java b/src/org/scada_lts/web/mvc/api/datasources/meta/MetaController.java
index ba2a536945..07f36c621b 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/meta/MetaController.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/meta/MetaController.java
@@ -7,7 +7,6 @@
 import com.serotonin.mango.rt.dataSource.meta.DataPointStateException;
 import com.serotonin.mango.rt.dataSource.meta.ResultTypeException;
 import com.serotonin.mango.rt.dataSource.meta.ScriptExecutor;
-import com.serotonin.mango.vo.User;
 import com.serotonin.web.i18n.LocalizableMessage;
 import com.serotonin.web.taglib.DateFunctions;
 import org.apache.commons.logging.Log;
diff --git a/src/org/scada_lts/web/mvc/api/datasources/meta/MetaPointLocatorJson.java b/src/org/scada_lts/web/mvc/api/datasources/meta/MetaPointLocatorJson.java
index 3b9185ab2a..3a83f2cd9a 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/meta/MetaPointLocatorJson.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/meta/MetaPointLocatorJson.java
@@ -5,6 +5,7 @@
 import com.serotonin.mango.vo.TimePeriodType;
 import com.serotonin.mango.vo.UpdateEventType;
 import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 import org.scada_lts.web.mvc.api.datasources.DataPointLocatorJson;
 
 import java.util.ArrayList;
@@ -17,6 +18,7 @@ public class MetaPointLocatorJson extends DataPointLocatorJson {
     private String script;
     private UpdateEventType updateEvent = UpdateEventType.CONTEXT_CHANGE;
     @JsonRemoteProperty
+    @XssProtect
     private String updateCronPattern;
     @JsonRemoteProperty
     private int executionDelaySeconds;
diff --git a/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpController.java b/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpController.java
index c67fee9fb4..0a210b3133 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpController.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpController.java
@@ -15,6 +15,7 @@
 import com.serotonin.modbus4j.exception.ModbusTransportException;
 import com.serotonin.modbus4j.ip.IpParameters;
 import com.serotonin.modbus4j.locator.BaseLocator;
+import org.scada_lts.web.beans.ApplicationBeans;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -67,7 +68,7 @@ public ResponseEntity<Map<String, Object>> testPointLocator(
         try {
             User user = Common.getUser(request);
             if(user != null) {
-                ObjectMapper mapper = new ObjectMapper();
+                ObjectMapper mapper = ApplicationBeans.getObjectMapper();
                 ModbusIpDataSourceJson ds = mapper.convertValue(data.get("datasource"), ModbusIpDataSourceJson.class);
                 ModbusIpPointLocatorJson pl = mapper.convertValue(data.get("pointLocator"), ModbusIpPointLocatorJson.class);
                 ModbusPointLocatorVO pointLocator = pl.parsePointLocatorData();
diff --git a/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpDataSourceJson.java b/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpDataSourceJson.java
index 68e237f5f1..90a094ec4d 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpDataSourceJson.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpDataSourceJson.java
@@ -1,6 +1,7 @@
 package org.scada_lts.web.mvc.api.datasources.modbusip;
 
 import com.serotonin.mango.vo.dataSource.modbus.ModbusIpDataSourceVO;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 import org.scada_lts.web.mvc.api.datasources.DataSourceJson;
 
 public class ModbusIpDataSourceJson extends DataSourceJson {
@@ -17,7 +18,9 @@ public class ModbusIpDataSourceJson extends DataSourceJson {
     private int maxReadRegisterCount;
     private int maxWriteRegisterCount;
 
+    @XssProtect
     private String transportType;
+    @XssProtect
     private String host;
     private int port;
     private boolean encapsulated;
@@ -38,7 +41,7 @@ public ModbusIpDataSourceJson(ModbusIpDataSourceVO dataSourceVO) {
         this.maxReadRegisterCount = dataSourceVO.getMaxReadRegisterCount();
         this.maxWriteRegisterCount = dataSourceVO.getMaxWriteRegisterCount();
 
-        this.transportType = dataSourceVO.getTransportType().name();
+        this.transportType = dataSourceVO.getTransportTypeStr();
         this.host = dataSourceVO.getHost();
         this.port = dataSourceVO.getPort();
         this.encapsulated = dataSourceVO.isEncapsulated();
diff --git a/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpPointLocatorJson.java b/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpPointLocatorJson.java
index 2e5a8e869c..617b4a2214 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpPointLocatorJson.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/modbusip/ModbusIpPointLocatorJson.java
@@ -1,6 +1,7 @@
 package org.scada_lts.web.mvc.api.datasources.modbusip;
 
 import com.serotonin.mango.vo.dataSource.modbus.ModbusPointLocatorVO;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 import org.scada_lts.web.mvc.api.datasources.DataPointLocatorJson;
 
 public class ModbusIpPointLocatorJson extends DataPointLocatorJson {
@@ -13,6 +14,7 @@ public class ModbusIpPointLocatorJson extends DataPointLocatorJson {
     private int offset;
     private byte bit;
     private int registerCount;
+    @XssProtect
     private String charset;
     private boolean settableOverride;
     private double multiplier;
diff --git a/src/org/scada_lts/web/mvc/api/datasources/snmp/SnmpDataSourceJson.java b/src/org/scada_lts/web/mvc/api/datasources/snmp/SnmpDataSourceJson.java
index fb436c363b..81471674b2 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/snmp/SnmpDataSourceJson.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/snmp/SnmpDataSourceJson.java
@@ -1,21 +1,32 @@
 package org.scada_lts.web.mvc.api.datasources.snmp;
 
 import com.serotonin.mango.vo.dataSource.snmp.SnmpDataSourceVO;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 import org.scada_lts.web.mvc.api.datasources.DataSourceJson;
 
 public class SnmpDataSourceJson extends DataSourceJson {
 
+    @XssProtect
     private String host;
     private int port;
     private int snmpVersion;
+    @XssProtect
     private String community;
+    @XssProtect
     private String engineId;
+    @XssProtect
     private String contextEngineId;
+    @XssProtect
     private String contextName;
+    @XssProtect
     private String securityName;
+    @XssProtect
     private String authProtocol;
+    @XssProtect
     private String authPassphrase;
+    @XssProtect
     private String privProtocol;
+    @XssProtect
     private String privPassphrase;
     private int securityLevel;
     private int retries;
@@ -24,6 +35,7 @@ public class SnmpDataSourceJson extends DataSourceJson {
     private int updatePeriods;
     private boolean trapEnabled;
     private int trapPort;
+    @XssProtect
     private String localAddress;
 
     public SnmpDataSourceJson(){}
diff --git a/src/org/scada_lts/web/mvc/api/datasources/snmp/SnmpPointLocatorJson.java b/src/org/scada_lts/web/mvc/api/datasources/snmp/SnmpPointLocatorJson.java
index bc3861abd9..798b60565d 100644
--- a/src/org/scada_lts/web/mvc/api/datasources/snmp/SnmpPointLocatorJson.java
+++ b/src/org/scada_lts/web/mvc/api/datasources/snmp/SnmpPointLocatorJson.java
@@ -1,15 +1,18 @@
 package org.scada_lts.web.mvc.api.datasources.snmp;
 
 import com.serotonin.mango.vo.dataSource.snmp.SnmpPointLocatorVO;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 import org.scada_lts.web.mvc.api.datasources.DataPointLocatorJson;
 
 public class SnmpPointLocatorJson extends DataPointLocatorJson {
 
-    String oid;
-    String binary0Value;
-    int setType;
-    boolean trapOnly;
-    boolean relinquishable;
+    @XssProtect
+    private String oid;
+    @XssProtect
+    private String binary0Value;
+    private int setType;
+    private boolean trapOnly;
+    private boolean relinquishable;
 
     public SnmpPointLocatorJson() {}
 
diff --git a/src/org/scada_lts/web/mvc/api/dto/ReportDTO.java b/src/org/scada_lts/web/mvc/api/dto/ReportDTO.java
index fecf2b980b..4c01785d4e 100644
--- a/src/org/scada_lts/web/mvc/api/dto/ReportDTO.java
+++ b/src/org/scada_lts/web/mvc/api/dto/ReportDTO.java
@@ -2,6 +2,7 @@
 
 import com.serotonin.mango.vo.report.ReportVO;
 import com.serotonin.mango.web.dwr.beans.RecipientListEntryBean;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 
 import java.util.HashMap;
 import java.util.List;
@@ -10,6 +11,7 @@
 public class ReportDTO {
 
     private int id;
+    @XssProtect
     private String name;
     private List<HashMap<String, Object>> points;
     private List<RecipientListEntryBean> recipients;
@@ -37,6 +39,7 @@ public class ReportDTO {
     private boolean schedule;
     private int schedulePeriod;
     private int runDelayMinutes;
+    @XssProtect
     private String scheduleCron;
     private boolean email;
     private boolean includeData;
diff --git a/src/org/scada_lts/web/mvc/api/dtp/report/DataPointsBaseOnNameFilter.java b/src/org/scada_lts/web/mvc/api/dtp/report/DataPointsBaseOnNameFilter.java
index 2e904c8c9d..545361fc94 100644
--- a/src/org/scada_lts/web/mvc/api/dtp/report/DataPointsBaseOnNameFilter.java
+++ b/src/org/scada_lts/web/mvc/api/dtp/report/DataPointsBaseOnNameFilter.java
@@ -1,6 +1,5 @@
 package org.scada_lts.web.mvc.api.dtp.report;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
@@ -8,6 +7,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.scada_lts.dao.model.point.PointValue;
 import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.web.mvc.api.dto.PointValueDTO;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -18,6 +18,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +34,7 @@ public class DataPointsBaseOnNameFilter {
     DataPointService dataPointService = new DataPointService();
 
     @RequestMapping(value = "/api/dtp/report/get/{partOfNameDS}/{typeDS}/{partOfNamePoint}/{startTime}/{endTime}", method = RequestMethod.GET)
-    public ResponseEntity<String> get(
+    public ResponseEntity<Map<String, List<PointValueDTO>>> get(
             @PathVariable("partOfNameDS") String partOfNameDS,
             @PathVariable("typeDS") String typeDS,
             @PathVariable("partOfNamePoint") String partOfNamePoint,
@@ -63,29 +64,25 @@ public ResponseEntity<String> get(
                 }
             } catch (Exception e) {
                 LOG.error(e);
-                return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+                return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
             }
 
 
             User user = Common.getUser(request);
 
             if (user != null && user.isAdmin()) {
-
-
                 Map<DataPointVO, List<PointValue>> pointsAndValuesFromRangeTime = dataPointService.getDataPoints(partOfNameDS, typeDS, partOfNamePoint, startTimeDT, endTimeDT);
-                List result = dataPointService.valuesPointBooleanBaseOnNameFilter2DTO(pointsAndValuesFromRangeTime);
-                String json = null;
-                ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(result);
-
-                return new ResponseEntity<String>("{\"data\":"+json+"}", HttpStatus.OK);
+                List<PointValueDTO> result = dataPointService.valuesPointBooleanBaseOnNameFilter2DTO(pointsAndValuesFromRangeTime);
+                Map<String, List<PointValueDTO>> response = new HashMap<>();
+                response.put("data", result);
+                return new ResponseEntity<>(response, HttpStatus.OK);
             }
 
-            return new ResponseEntity<String>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 
         } catch (Exception e) {
             LOG.error(e);
-            return new ResponseEntity<String>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 }
diff --git a/src/org/scada_lts/web/mvc/api/json/JsonEventComment.java b/src/org/scada_lts/web/mvc/api/json/JsonEventComment.java
deleted file mode 100644
index 6cb48aa253..0000000000
--- a/src/org/scada_lts/web/mvc/api/json/JsonEventComment.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.scada_lts.web.mvc.api.json;
-
-import com.serotonin.mango.Common;
-
-public class JsonEventComment {
-    private int userId;
-    private int commentType;
-    private long typeKey;
-    private long ts;
-    private String commentText;
-    public JsonEventComment() {}
-
-    public JsonEventComment(int userId, int commentType, long typeKey, long ts, String commentText) {
-        this.userId = userId;
-        this.commentType = commentType;
-        this.typeKey = typeKey;
-        this.ts = ts;
-        this.commentText = commentText;
-    }
-
-    public int getUserId() {
-        return userId;
-    }
-
-    public void setUserId(int userId) {
-        this.userId = userId;
-    }
-
-    public int getCommentType() {
-        return commentType;
-    }
-
-    public void setCommentType(int commentType) {
-        this.commentType = commentType;
-    }
-
-    public long getTypeKey() {
-        return typeKey;
-    }
-
-    public void setTypeKey(long typeKey) {
-        this.typeKey = typeKey;
-    }
-
-    public long getTs() {
-        return ts;
-    }
-
-    public void setTs(long ts) {
-        this.ts = ts;
-    }
-
-    public String getCommentText() {
-        return commentText;
-    }
-
-    public void setCommentText(String commentText) {
-        this.commentText = commentText;
-    }
-}
diff --git a/src/org/scada_lts/web/mvc/api/json/JsonPointProperties.java b/src/org/scada_lts/web/mvc/api/json/JsonPointProperties.java
index 1ca370d411..275be80b89 100644
--- a/src/org/scada_lts/web/mvc/api/json/JsonPointProperties.java
+++ b/src/org/scada_lts/web/mvc/api/json/JsonPointProperties.java
@@ -4,12 +4,15 @@
 import com.serotonin.mango.view.event.EventTextRenderer;
 import com.serotonin.mango.view.text.TextRenderer;
 import com.serotonin.mango.vo.DataPointVO;
+import org.scada_lts.web.beans.validation.xss.XssProtect;
 
 import java.io.Serializable;
 
 public class JsonPointProperties implements Serializable {
 
+    @XssProtect
     private String name;
+    @XssProtect
     private String description;
     private Boolean enabled;
     private Integer loggingType;
@@ -27,6 +30,7 @@ public class JsonPointProperties implements Serializable {
     private Double discardLowLimit;
     private Double discardHighLimit;
     private Integer engineeringUnits;
+    @XssProtect
     private String chartColour;
     private Integer purgeStrategy;
     private Integer purgeValuesLimit;
diff --git a/src/org/scada_lts/web/mvc/api/json/JsonSettingsMisc.java b/src/org/scada_lts/web/mvc/api/json/JsonSettingsMisc.java
index 59fdf589ac..71a1c0533e 100644
--- a/src/org/scada_lts/web/mvc/api/json/JsonSettingsMisc.java
+++ b/src/org/scada_lts/web/mvc/api/json/JsonSettingsMisc.java
@@ -6,8 +6,8 @@ public class JsonSettingsMisc implements Serializable {
 
     private int uiPerformance;
     private String dataPointRuntimeValueSynchronized;
-    public boolean enableFullScreen;
-    public boolean hideShortcutDisableFullScreen;
+    public boolean viewForceFullScreenEnabled;
+    public boolean viewHideShortcutDisableFullScreenEnabled;
     public int eventPendingLimit;
     public boolean eventPendingCacheEnabled;
     public boolean workItemsReportingEnabled;
@@ -16,21 +16,11 @@ public class JsonSettingsMisc implements Serializable {
     public int threadsNameAdditionalLength;
     public String webResourceGraphicsPath;
     public String webResourceUploadsPath;
+    public boolean eventAssignEnabled;
+    public int pointExtendedNameLengthInReportsLimit;
 
     public JsonSettingsMisc() {}
 
-    @Deprecated(since = "2.7.7.1")
-    public JsonSettingsMisc(int uiPerformance, String dataPointRuntimeValueSynchronized, boolean enableFullScreen, boolean hideShortcutDisableFullScreen, int eventPendingLimit, boolean eventPendingCacheEnabled, String webResourceGraphicsPath, String webResourceUploadsPath) {
-        this.uiPerformance = uiPerformance;
-        this.dataPointRuntimeValueSynchronized = dataPointRuntimeValueSynchronized;
-        this.enableFullScreen = enableFullScreen;
-        this.hideShortcutDisableFullScreen = hideShortcutDisableFullScreen;
-        this.eventPendingLimit = eventPendingLimit;
-        this.eventPendingCacheEnabled = eventPendingCacheEnabled;
-        this.webResourceGraphicsPath = webResourceGraphicsPath;
-        this.webResourceUploadsPath = webResourceUploadsPath;
-    }
-
     public int getUiPerformance() {
         return uiPerformance;
     }
@@ -47,20 +37,20 @@ public void setDataPointRuntimeValueSynchronized(String dataPointRuntimeValueSyn
         this.dataPointRuntimeValueSynchronized = dataPointRuntimeValueSynchronized;
     }
 
-    public boolean isEnableFullScreen() {
-        return enableFullScreen;
+    public boolean isViewForceFullScreenEnabled() {
+        return viewForceFullScreenEnabled;
     }
 
-    public void setEnableFullScreen(boolean enableFullScreen) {
-        this.enableFullScreen = enableFullScreen;
+    public void setViewForceFullScreenEnabled(boolean viewForceFullScreenEnabled) {
+        this.viewForceFullScreenEnabled = viewForceFullScreenEnabled;
     }
 
-    public boolean isHideShortcutDisableFullScreen() {
-        return hideShortcutDisableFullScreen;
+    public boolean isViewHideShortcutDisableFullScreenEnabled() {
+        return viewHideShortcutDisableFullScreenEnabled;
     }
 
-    public void setHideShortcutDisableFullScreen(boolean hideShortcutDisableFullScreen) {
-        this.hideShortcutDisableFullScreen = hideShortcutDisableFullScreen;
+    public void setViewHideShortcutDisableFullScreenEnabled(boolean viewHideShortcutDisableFullScreenEnabled) {
+        this.viewHideShortcutDisableFullScreenEnabled = viewHideShortcutDisableFullScreenEnabled;
     }
 
     public int getEventPendingLimit() {
@@ -126,4 +116,21 @@ public String getWebResourceUploadsPath() {
     public void setWebResourceUploadsPath(String webResourceUploadsPath) {
         this.webResourceUploadsPath = webResourceUploadsPath;
     }
+
+    public boolean isEventAssignEnabled() {
+        return eventAssignEnabled;
+    }
+
+    public void setEventAssignEnabled(boolean eventAssignEnabled) {
+        this.eventAssignEnabled = eventAssignEnabled;
+    }
+
+    public int getDataPointExtendedNameLengthInReportsLimit() {
+        return pointExtendedNameLengthInReportsLimit;
+    }
+
+    public void setDataPointExtendedNameLengthInReportsLimit(int pointExtendedNameLengthInReportsLimit) {
+        this.pointExtendedNameLengthInReportsLimit = pointExtendedNameLengthInReportsLimit;
+    }
+
 }
diff --git a/src/org/scada_lts/web/mvc/api/json/JsonSettingsSystemInfo.java b/src/org/scada_lts/web/mvc/api/json/JsonSettingsSystemInfo.java
index 9b55baa443..d5a01ffa53 100644
--- a/src/org/scada_lts/web/mvc/api/json/JsonSettingsSystemInfo.java
+++ b/src/org/scada_lts/web/mvc/api/json/JsonSettingsSystemInfo.java
@@ -7,13 +7,17 @@ public class JsonSettingsSystemInfo implements Serializable {
     private String newVersionNotificationLevel;
     private String instanceDescription;
     private String language;
+    private String topDescription;
+    private String topDescriptionPrefix;
 
     public JsonSettingsSystemInfo() {}
 
-    public JsonSettingsSystemInfo(String newVersionNotificationLevel, String instanceDescription, String language) {
+    public JsonSettingsSystemInfo(String newVersionNotificationLevel, String instanceDescription, String language, String topDescriptionPrefix, String topDescription) {
         this.newVersionNotificationLevel = newVersionNotificationLevel;
         this.instanceDescription = instanceDescription;
         this.language = language;
+        this.topDescriptionPrefix = topDescriptionPrefix;
+        this.topDescription = topDescription;
     }
 
     public String getNewVersionNotificationLevel() {
@@ -39,4 +43,20 @@ public String getLanguage() {
     public void setLanguage(String language) {
         this.language = language;
     }
+
+    public String getTopDescription(){
+        return topDescription;
+    }
+
+    public void setTopDescription(String topDescription){
+        this.topDescription = topDescription;
+    }
+
+    public String getTopDescriptionPrefix(){
+        return topDescriptionPrefix;
+    }
+
+    public void setTopDescriptionPrefix(String topDescriptionPrefix){
+        this.topDescriptionPrefix = topDescriptionPrefix;
+    }
 }
diff --git a/src/org/scada_lts/web/mvc/api/json/JsonUserComment.java b/src/org/scada_lts/web/mvc/api/json/JsonUserComment.java
new file mode 100644
index 0000000000..31af8d06c9
--- /dev/null
+++ b/src/org/scada_lts/web/mvc/api/json/JsonUserComment.java
@@ -0,0 +1,52 @@
+package org.scada_lts.web.mvc.api.json;
+
+public class JsonUserComment {
+    private int userId;
+    private int commentType;
+    private long typeKey;
+    private long ts;
+    private String comment;
+    private String username;
+    private String prettyTime;
+
+    public JsonUserComment() {}
+
+    public JsonUserComment(int userId, int commentType, long typeKey, long ts, String comment,
+                           String username, String prettyTime) {
+        this.userId = userId;
+        this.commentType = commentType;
+        this.typeKey = typeKey;
+        this.ts = ts;
+        this.comment = comment;
+        this.username = username;
+        this.prettyTime = prettyTime;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public int getCommentType() {
+        return commentType;
+    }
+
+    public long getTypeKey() {
+        return typeKey;
+    }
+
+    public long getTs() {
+        return ts;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPrettyTime() {
+        return prettyTime;
+    }
+}
diff --git a/src/org/scada_lts/web/mvc/controller/PointHierarchyController.java b/src/org/scada_lts/web/mvc/controller/PointHierarchyController.java
index 2bf5738682..f799d45e24 100644
--- a/src/org/scada_lts/web/mvc/controller/PointHierarchyController.java
+++ b/src/org/scada_lts/web/mvc/controller/PointHierarchyController.java
@@ -18,9 +18,7 @@
 package org.scada_lts.web.mvc.controller;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -28,10 +26,11 @@
 import com.serotonin.mango.util.DateUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.joda.time.DateTime;
 import org.scada_lts.cache.PointHierarchyCache;
 import org.scada_lts.dao.model.pointhierarchy.PointHierarchyNode;
 import org.scada_lts.service.pointhierarchy.PointHierarchyService;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -40,8 +39,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.vo.User;
 
@@ -83,41 +80,33 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 		return new ModelAndView("redirect:/login.htm");
 	}
 
-	@RequestMapping(value = "/pointHierarchy/{key}", method = RequestMethod.GET)
-	public @ResponseBody String getPointHierarchy(@PathVariable("key") int key, HttpServletRequest request) {
+	@RequestMapping(value = "/pointHierarchy/{key}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<List<PointHierarchyNode>> getPointHierarchy(@PathVariable("key") int key, HttpServletRequest request) {
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("/pointHierarchy/{key} key:" + key);
 		}
 		User user = Common.getUser(request);
 		if (user != null && user.isAdmin()) {
-			String json = "";
 			List<PointHierarchyNode> lst = null;
 			try {
 				lst = PointHierarchyCache.getInstance().getOnBaseParentId(key);
 			} catch (Exception e1) {
 				LOG.error(e1);
 			}
-
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(lst);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(lst);
 		} else {
-			return "";
+			return ResponseEntity.ok(new ArrayList<>());
 		}
 	}
 
-	@RequestMapping(value = "/pointHierarchy/del/{parentId}/{key}/{isFolder}", method = RequestMethod.POST)
-	public @ResponseBody String deletePointHierarchy(@PathVariable("parentId") int parentId,
+	@RequestMapping(value = "/pointHierarchy/del/{parentId}/{key}/{isFolder}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<String> deletePointHierarchy(@PathVariable("parentId") int parentId,
 			@PathVariable("key") int key,@PathVariable("isFolder") boolean isFolder, HttpServletRequest request) throws InterruptedException {
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("/pointHierarchy/del/{parentId}/{key} parentId:" + parentId + " key:" + key + " isFolder:"+isFolder);
 		}
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			boolean ok = false;
 			if (isFolder) {
 				try {
@@ -139,21 +128,14 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 			  ok = pointHierarchyService.move(parentId, 0, key, isFolder);
 			}
 
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-			  json = mapper.writeValueAsString(ok);
-			} catch (JsonProcessingException e) {
-			  LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(String.valueOf(ok));
 		} else {
-			return "";
+			return ResponseEntity.ok("");
 		}
 	}
 
-	@RequestMapping(value = "/pointHierarchy/new/{newParentId}/{newTitle}", method = RequestMethod.POST)
-	public @ResponseBody String addPointHierarchy(@PathVariable("newParentId") int newParentId,
+	@RequestMapping(value = "/pointHierarchy/new/{newParentId}/{newTitle}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<String> addPointHierarchy(@PathVariable("newParentId") int newParentId,
 			@PathVariable("newTitle") String newTitle, ModelMap model, HttpServletRequest request)
 			throws IOException, NullPointerException {
 		if (LOG.isTraceEnabled()) {
@@ -161,100 +143,65 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 		}
 
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			int id = pointHierarchyService.add(PointHierarchyCache.ROOT, newTitle);
-			ObjectMapper mapper = new ObjectMapper();
-			String json = "";
-			try {
-				json = mapper.writeValueAsString(id);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(String.valueOf(id));
 		} else {
-			return "";
+			return ResponseEntity.ok("");
 		}
 	}
 
-	@RequestMapping(value = "/pointHierarchy/edit/{parentId}/{key}/{newTitle}", method = RequestMethod.POST)
-	public @ResponseBody String editPointHierarchy(@PathVariable("parentId") int parentId, @PathVariable("key") int key,
+	@RequestMapping(value = "/pointHierarchy/edit/{parentId}/{key}/{newTitle}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<String> editPointHierarchy(@PathVariable("parentId") int parentId, @PathVariable("key") int key,
 			@PathVariable("newTitle") String newTitle, HttpServletRequest request) {
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("/pointHierarchy/edit/{key}/{newTitle} key:" + key + " newTitle:" + newTitle);
 		}
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			boolean ok = pointHierarchyService.edt(parentId, key, newTitle, true);
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(ok);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(String.valueOf(ok));
 		} else {
-			return "";
+			return ResponseEntity.ok("");
 		}
 	}
 
-	@RequestMapping(value = "/pointHierarchy/move/{key}/{oldParentId}/{newParentId}/{isFolder}", method = RequestMethod.POST)
-	public @ResponseBody String movePointHierarchy(@PathVariable("key") int key,
+	@RequestMapping(value = "/pointHierarchy/move/{key}/{oldParentId}/{newParentId}/{isFolder}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<String> movePointHierarchy(@PathVariable("key") int key,
 			@PathVariable("oldParentId") int oldParentId, @PathVariable("newParentId") int newParentId,
 			@PathVariable("isFolder") boolean isFolder, HttpServletRequest request) {
 		LOG.info("/pointHierarchy/move/{key}/{oldParentId}/{newParentId}" + " key:" + key + "" + " oldParentId:"
 				+ oldParentId + "" + " newParentId:" + newParentId + "" + " isFolder:" + isFolder);
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			pointHierarchyService.move(oldParentId, newParentId, key, isFolder);
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(true);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(String.valueOf(true));
 		} else {
-			return "";
+			return ResponseEntity.ok("");
 		}
 	}
 	
-	@RequestMapping(value = "/pointHierarchy/find/{search}/{page}", method = RequestMethod.GET)
-	public @ResponseBody String find(@PathVariable("search") String search, @PathVariable("page") int page, HttpServletRequest request) throws Exception {
+	@RequestMapping(value = "/pointHierarchy/find/{search}/{page}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<List<PointHierarchyNode>> find(@PathVariable("search") String search, @PathVariable("page") int page, HttpServletRequest request) throws Exception {
 		LOG.info("/pointHierarchy/find/{search} search:"+search+" page:"+page);
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			List<PointHierarchyNode> lst = pointHierarchyService.search(search, page);
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(lst);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(lst);
 		} else {
-			return "";
+			return ResponseEntity.ok(new ArrayList<>());
 		}
 	}
 	
-	@RequestMapping(value = "/pointHierarchy/paths/{key}/{isFolder}", method = RequestMethod.GET)
-	public @ResponseBody String find(@PathVariable("key") int key, @PathVariable("isFolder") boolean isFolder, @PathVariable("interval") int interval, HttpServletRequest request) throws Exception {
+	@RequestMapping(value = "/pointHierarchy/paths/{key}/{isFolder}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public @ResponseBody ResponseEntity<List<PointHierarchyNode>> find(@PathVariable("key") int key, @PathVariable("isFolder") boolean isFolder, @PathVariable("interval") int interval, HttpServletRequest request) throws Exception {
 		LOG.info("/pointHierarchy/paths/{key}/{isFolder} key:"+key+" isFolder:"+isFolder+" interval:"+interval);
 		User user = Common.getUser(request);
-		if (user.isAdmin()) {
+		if (user != null && user.isAdmin()) {
 			List<PointHierarchyNode> lst = pointHierarchyService.getPaths(key, isFolder);
-			String json = "";
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				json = mapper.writeValueAsString(lst);
-			} catch (JsonProcessingException e) {
-				LOG.error(e);
-			}
-			return json;
+			return ResponseEntity.ok(lst);
 		} else {
-			return "";
+			return ResponseEntity.ok(new ArrayList<>());
 		}
 	}
 }
diff --git a/src/org/scada_lts/web/mvc/controller/ViewEditController.java b/src/org/scada_lts/web/mvc/controller/ViewEditController.java
index 3a8dec4b4e..710b1713ef 100644
--- a/src/org/scada_lts/web/mvc/controller/ViewEditController.java
+++ b/src/org/scada_lts/web/mvc/controller/ViewEditController.java
@@ -33,6 +33,7 @@
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scada_lts.mango.service.SystemSettingsService;
 import org.scada_lts.mango.service.UsersProfileService;
 import org.scada_lts.mango.service.ViewService;
 import org.scada_lts.permissions.service.GetViewsWithAccess;
@@ -83,10 +84,12 @@ public class ViewEditController {
 
     private final ViewService viewService;
     private final ViewEditValidator validator;
+    private final SystemSettingsService systemSettingsService;
 
-    public ViewEditController(ViewService viewService, ViewEditValidator validator) {
+    public ViewEditController(ViewService viewService, ViewEditValidator validator, SystemSettingsService systemSettingsService) {
         this.viewService = viewService;
         this.validator = validator;
+        this.systemSettingsService = systemSettingsService;
     }
 
     public void setSuccessUrl(String successUrl) {
@@ -125,6 +128,7 @@ protected ModelAndView showForm(HttpServletRequest request) throws Exception {
         model.put(IMAGE_SETS_ATTRIBUTE, Common.ctx.getImageSets());
         model.put(DYNAMIC_IMAGES_ATTRIBUTE, Common.ctx.getDynamicImages());
         model.put("currentView", view);
+        model.put("isEventAssignEnabled", systemSettingsService.isEventAssignEnabled());
         return new ModelAndView(FORM_VIEW, model);
     }
 
@@ -159,6 +163,7 @@ protected ModelAndView handleImage(HttpServletRequest request, HttpServletRespon
         model.put(IMAGE_SETS_ATTRIBUTE, Common.ctx.getImageSets());
         model.put(DYNAMIC_IMAGES_ATTRIBUTE, Common.ctx.getDynamicImages());
         model.put("currentView", view);
+        model.put("isEventAssignEnabled", systemSettingsService.isEventAssignEnabled());
         return new ModelAndView(FORM_VIEW, model);
     }
 
@@ -180,6 +185,7 @@ protected ModelAndView save(HttpServletRequest request, @ModelAttribute(FORM_OBJ
             model.put(IMAGE_SETS_ATTRIBUTE, Common.ctx.getImageSets());
             model.put(DYNAMIC_IMAGES_ATTRIBUTE, Common.ctx.getDynamicImages());
             model.put("currentView", view);
+            model.put("isEventAssignEnabled", systemSettingsService.isEventAssignEnabled());
             return new ModelAndView(FORM_VIEW, model);
         }
 
diff --git a/src/org/scada_lts/web/security/XssFilter.java b/src/org/scada_lts/web/security/XssFilter.java
new file mode 100644
index 0000000000..fa56872db5
--- /dev/null
+++ b/src/org/scada_lts/web/security/XssFilter.java
@@ -0,0 +1,35 @@
+package org.scada_lts.web.security;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class XssFilter extends OncePerRequestFilter {
+
+    private static final Logger LOG = LogManager.getLogger(XssFilter.class);
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+
+        String queryString = request.getQueryString();
+        if (queryString != null && !XssValidatorUtils.validateHttpQuery(queryString)) {
+            LOG.warn("Potential XSS detected in request. Request URI: {}, Query: {}",
+                    request.getRequestURI(), queryString);
+
+            try {
+                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+                        "Potential XSS detected in the request Query: " + queryString);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            return;
+        }
+
+        filterChain.doFilter(request, response);
+    }
+}
diff --git a/src/org/scada_lts/web/security/XssProtectCssStyleSerializer.java b/src/org/scada_lts/web/security/XssProtectCssStyleSerializer.java
new file mode 100644
index 0000000000..5e2f4904e3
--- /dev/null
+++ b/src/org/scada_lts/web/security/XssProtectCssStyleSerializer.java
@@ -0,0 +1,24 @@
+package org.scada_lts.web.security;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.scada_lts.web.mvc.api.css.CssStyle;
+
+import java.io.IOException;
+
+
+public class XssProtectCssStyleSerializer extends StdSerializer<CssStyle> {
+
+    public XssProtectCssStyleSerializer() {
+        super(CssStyle.class);
+    }
+
+    @Override
+    public void serialize(CssStyle value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        String content = XssProtectUtils.escapeHtml(value.getContent());
+        jgen.writeStartObject();
+        jgen.writeStringField("content", content);
+        jgen.writeEndObject();
+    }
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/web/security/XssProtectStringSerializer.java b/src/org/scada_lts/web/security/XssProtectStringSerializer.java
new file mode 100644
index 0000000000..04ac03caf1
--- /dev/null
+++ b/src/org/scada_lts/web/security/XssProtectStringSerializer.java
@@ -0,0 +1,20 @@
+package org.scada_lts.web.security;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+
+public class XssProtectStringSerializer extends StdSerializer<String> {
+
+    public XssProtectStringSerializer() {
+        super(String.class);
+    }
+
+    @Override
+    public void serialize(String value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        String content = XssProtectUtils.escapeHtml(value);
+        jgen.writeString(content);
+    }
+}
\ No newline at end of file
diff --git a/src/org/scada_lts/web/security/XssProtectUtils.java b/src/org/scada_lts/web/security/XssProtectUtils.java
new file mode 100644
index 0000000000..de9e5e9544
--- /dev/null
+++ b/src/org/scada_lts/web/security/XssProtectUtils.java
@@ -0,0 +1,32 @@
+package org.scada_lts.web.security;
+
+import org.springframework.web.util.HtmlUtils;
+
+public final class XssProtectUtils {
+
+    public XssProtectUtils() {}
+
+    public static String escapeHtml(String value) {
+        if(value == null)
+            return "";
+        String content = HtmlUtils.htmlEscape(value);
+        return whiteSpaceHtmlCode(newLineHtmlCode(content));
+    }
+
+    private static String newLineHtmlCode(String content) {
+        if(content.contains("\n")) {
+            return content.replace("\n", "&#10;").replace("\r", "");
+        }
+        return content.replace("\r", "&#13;");
+    }
+
+    private static String whiteSpaceHtmlCode(String content) {
+        return content.replace("\t", "&emsp;")
+                .replace("\u000B","&#11;")
+                .replace("\f", "&#12;")
+                .replace("\u001C", "&#28;")
+                .replace("\u001D", "&#29;")
+                .replace("\u001E", "&#30;")
+                .replace("\u001F", "&#31;");
+    }
+}
diff --git a/src/org/scada_lts/web/security/XssValidatorUtils.java b/src/org/scada_lts/web/security/XssValidatorUtils.java
new file mode 100644
index 0000000000..16654e6a86
--- /dev/null
+++ b/src/org/scada_lts/web/security/XssValidatorUtils.java
@@ -0,0 +1,62 @@
+package org.scada_lts.web.security;
+
+import org.scada_lts.serorepl.utils.StringUtils;
+import org.scada_lts.utils.SystemSettingsUtils;
+
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+public final class XssValidatorUtils {
+
+    private XssValidatorUtils() {}
+
+    private static final Pattern SECURITY_HTTP_ACCESS_DENIED_QUERY_REGEX = init(SystemSettingsUtils.getSecurityHttpQueryAccessDeniedRegex());
+    private static final Pattern SECURITY_HTTP_ACCESS_GRANTED_QUERY_REGEX = init(SystemSettingsUtils.getSecurityHttpQueryAccessGrantedRegex());
+    public static final int SECURITY_HTTP_ACCESS_GRANTED_QUERY_LIMIT = SystemSettingsUtils.getSecurityHttpQueryLimit();
+    public static final boolean SECURITY_HTTP_QUERY_PROTECT_ENABLED = SystemSettingsUtils.isSecurityHttpQueryProtectEnabled();
+
+    private static final Pattern SECURITY_HTTP_ACCESS_DENIED_BODY_REGEX = init(SystemSettingsUtils.getSecurityHttpBodyAccessDeniedRegex());
+    private static final Pattern SECURITY_HTTP_ACCESS_GRANTED_BODY_REGEX = init(SystemSettingsUtils.getSecurityHttpBodyAccessGrantedRegex());
+    public static final boolean SECURITY_HTTP_BODY_PROTECT_ENABLED = SystemSettingsUtils.isSecurityHttpBodyProtectEnabled();
+
+    public static boolean validateHttpQuery(String query) {
+        return validate(query, SECURITY_HTTP_QUERY_PROTECT_ENABLED, q -> q.length() > SECURITY_HTTP_ACCESS_GRANTED_QUERY_LIMIT,
+                SECURITY_HTTP_ACCESS_DENIED_QUERY_REGEX, SECURITY_HTTP_ACCESS_GRANTED_QUERY_REGEX);
+
+    }
+
+    public static boolean validateHttpBody(String body) {
+        return validate(body, SECURITY_HTTP_BODY_PROTECT_ENABLED, b -> false, SECURITY_HTTP_ACCESS_DENIED_BODY_REGEX,
+                SECURITY_HTTP_ACCESS_GRANTED_BODY_REGEX);
+    }
+
+    private static boolean validate(String input,
+                                    boolean protectEnabled,
+                                    Predicate<String> beforeCheckRegex,
+                                    Pattern accessDeniedRegex,
+                                    Pattern accessGrantedRegex) {
+        if(!protectEnabled)
+            return true;
+
+        if (input == null || input.isEmpty()) {
+            return true;
+        }
+
+        if(beforeCheckRegex.test(input)) {
+            return false;
+        }
+
+        if(accessDeniedRegex != null && accessDeniedRegex.matcher(input).matches()) {
+            return false;
+        }
+
+        return accessGrantedRegex == null || accessGrantedRegex.matcher(input).matches();
+    }
+
+    private static Pattern init(String regex) {
+        if(StringUtils.isEmpty(regex)) {
+            return null;
+        }
+        return Pattern.compile(regex);
+    }
+}
diff --git a/src/org/scada_lts/web/ws/model/WsEventMessage.java b/src/org/scada_lts/web/ws/model/WsEventMessage.java
index e985d7e27c..817e7ab152 100644
--- a/src/org/scada_lts/web/ws/model/WsEventMessage.java
+++ b/src/org/scada_lts/web/ws/model/WsEventMessage.java
@@ -43,6 +43,10 @@ public String getAckMessage() {
         return getString(instance.getAckMessage());
     }
 
+    public LocalizableMessage getAssigneeMessage() {
+        return instance.getAssigneeMessage();
+    }
+
     public String getExportAckMessage() {
         return getString(instance.getExportAckMessage());
     }
@@ -159,6 +163,18 @@ public String getAction() {
         return action;
     }
 
+    public long getAssigneeTimestamp() {
+        return instance.getAssigneeTimestamp();
+    }
+
+    public String getAssigneeUsername() {
+        return instance.getAssigneeUsername();
+    }
+
+    public boolean isAssignee() {
+        return instance.isAssignee();
+    }
+      
     public int getTypeId() {
         return instance.getEventType().getEventSourceId();
     }
diff --git a/src/org/scada_lts/web/ws/services/EventsServiceWebSocket.java b/src/org/scada_lts/web/ws/services/EventsServiceWebSocket.java
deleted file mode 100644
index dd4fd2121c..0000000000
--- a/src/org/scada_lts/web/ws/services/EventsServiceWebSocket.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.scada_lts.web.ws.services;
-
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.stereotype.Service;
-
-/**
- * Events WebSocket Service
- *
- * WebSocket service for sending a WebSocket messages to subscribers.
- * It is a concrete implementation of AbstractWebSocket.
- * This class will be initialized during @Autowired process.
- *
- * @author Radoslaw Jajko
- * @version 1.1.0
- */
-@Deprecated(since = "2.7.8")
-@Service
-public class EventsServiceWebSocket extends AbstractWebSocket {
-
-    private static final String WS_DESTINATION = "/alarm";
-
-    public EventsServiceWebSocket(SimpMessagingTemplate template) {
-        super(template);
-    }
-
-    public void notifyEventsSubscribers(String message) {
-        sendWebSocketMessage(WS_DESTINATION, message);
-    }
-
-}
diff --git a/test/WEB-INF/classes/env.properties b/test/WEB-INF/classes/env.properties
deleted file mode 100644
index ad07ffb7cd..0000000000
--- a/test/WEB-INF/classes/env.properties
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-#    Mango - Open Source M2M - http://mango.serotoninsoftware.com
-#    Copyright (C) 2006-2009 Serotonin Software Technologies Inc.
-#    @author Matthew Lohbihler
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-# PARA INTEGRAR O ScadaBR AO POSTGRESQL v9.2 INSTALE O POSTGRESQL v9.2 NA M\u00c1QUINA SERVIDORA
-# ALTERE A LINHA db.password=admin (COLOQUE A SENHA DEFINIDA POR VOC\u00ca)
-# N\u00c3O REMOVA A LINHA db.url.public=jdbc:postgresql://localhost:5432/postgres
-
-#testowy!!!!
-
-#db.type=postgres
-#db.url=jdbc:postgresql://localhost:5432/scadabr
-#db.url.public=jdbc:postgresql://localhost:5432/postgres
-#db.username=postgres
-#db.password=admin
-#db.pool.maxActive=10
-#db.pool.maxIdle=10
-
-db.type=mysql
-db.datasource=true
-db.datasourceName=java:comp/test_env/jdbc/scadalts
-#db.url=jdbc:mysql://localhost:3306/scadalts
-#db.username=root
-#db.password=root
-#db.pool.maxActive=10
-#db.pool.maxIdle=10
-#db.update.log.dir=logs
-#db.upgrade.check=false
-
-#db.type=derby
-#db.url=~../../bin/scadabrDB
-#db.username=
-#db.password=
-
-js.optimizationlevel=-1
-
-api.authentication=disabled
-api.username=admin
-api.password=admin
-
-abilit.disableDataSourcesOnServerStart=false
-
-abilit.api.replace.alert.onview=true
-
-
-abilit.cacheEnable=true
-abilit.START_UPDATE_UNSILENCED_ALARM_LEVEL=100000
-abilit.START_UPDATE_EVENT_DETECTORS=100000
-abilit.START_UPDATE_PENDING_EVENTS=100000
-abilit.MILLIS_SECONDS_PERIOD_UPDATE_UNSILENCED_ALARM_LEVEL=1000
-#abilit.MILLIS_SECONDS_PERIOD_UPDATE_EVENT_DETECTORS=1000
-abilit.MILLIS_SECONDS_PERIOD_UPDATE_PENDING_EVENTS=1000
-abilit.CRONE_UPDATE_CACHE_POINT_HIERARCHY=0 0/10 * * * ?
-
-# every minute
-abilit.CRONE_UPDATE_DATA_SOURCES_POINTS=0 0/1 * * * ?
-abilit.USE_CACHE_DATA_SOURCES_POINTS_WHEN_THE_SYSTEM_IS_READY=true
-
-#Permission ACL
-abilit.USE_ACL=false
-abilit.ACL_SERVER=http://localhost:8090
-
-#Events
-abilit.DO_NOT_CREATE_EVENTS_FOR_EMAIL_ERROR=true
-
-#Reactivation HttpRetriver
-abilit.HTTP_RETRIVER_SLEEP_CHECK_TO_REACTIVATION_WHEN_START=false
-abilit.HTTP_RETRIVER_DO_NOT_ALLOW_ENABLE_REACTIVATION=false
-
-#security.hashAlgorithm=NONE
-#grove.url=http://mango.serotoninsoftware.com/servlet
-
-api.amcharts.aggregation.enabled=true
-api.amcharts.aggregation.valuesLimit=20000
-api.amcharts.aggregation.limitFactor=1.5
-
-user.cache.enabled=true
-usersprofile.cache.enabled=true
-permissions.cache.enabled=true
-shareuser.cache.enabled=true
-usercomment.cache.enabled=true
-view.cache.enabled=true
-
-alarmlevel.highest.cache.enabled=true
-alarmlevel.highest.cache.reset.enabled=true
-alarmlevel.highest.cache.reset.cron=0 0 1/3 ? * * *
-
-svg.validator.enabled=true
-svg.validator.only-xml=false
-svg.validator.schemas=svg/svg11-flat-20110816/svg11-flat-20110816.xsd;svg/svg10-flat-20010904/svg10-flat-20010904.xsd
-# Incompatible with SVG 1.0/1.1/1.1 Second Edition/1.1 Tiny/1.1 Basic - often found in files;
-# rdf:RDF - https://www.w3.org/TR/SVGTiny12/metadata.html
-svg.validator.tags.ignore=rdf:RDF;sodipodi:namedview;inkscape:perspective
-svg.validator.messages.ignore=must appear on element;Attribute 'blend' is not allowed to appear in element 'feBlend'.;sodipodi:;inkscape:;Attribute 'vector-effect' is not allowed to appear in element 'g'.
-systemsettings.http.response.headers={}
-
-datapoint.runtime.value.synchronized=NONE
-
-comm.serial.timeout.read=500
-comm.serial.timeout.write=500
-comm.serial.timeout.mode=0
-comm.serial.sleep=1000
-
-systemsettings.email.timeout=60000
-processing.workitems.limit=51
-processing.workitems.failed.limit=51
-processing.workitems.running.limit=51
-processing.workitems.running.repeat=51
-processing.workitems.history.process.limit=51
-processing.workitems.history.priority.high.limit=51
-processing.workitems.history.priority.medium.limit=51
-processing.workitems.history.priority.low.limit=51
-processing.workitems.history.longer.thanMs=1500
-processing.workitems.history.longer.limit=200
-
-scadalts.security.js.access.denied.method.regexes=getDeclaredField;getPassword;getClass;getRuntime;exec
-scadalts.security.js.access.denied.class.regexes=java.lang.Runtime;java.lang.Runtime.*;java.lang.reflect.*;java.lang.ref.*;java.lang.System.*;java.lang.System;java.lang.ClassLoader;java.lang.Compiler;java.lang.SecurityManager;java.lang.Thread;java.lang.ThreadGroup;java.lang.ThreadLocal
-scadalts.security.js.access.granted.method.regexes=^.*
-scadalts.security.js.access.granted.class.regexes=^.*
-
-view.forceFullScreen=false
-view.hideShortcutDisableFullScreen=false
-eventdetector.cache.enabled=true
-event.pending.limit=101
-event.pending.update.limit=5001
-threads.name.additional.length=5
-workitems.reporting.enabled=false
-workitems.reporting.itemspersecond.enabled=false
-workitems.reporting.itemspersecond.limit=20000
-
-webresource.uploads.path=static/uploads
-webresource.graphics.path=static/graphics
-svg.validator.disallow-doctype-decl.enabled=false
\ No newline at end of file
diff --git a/test/br/org/scadabr/db/dao/UsersProfileDaoTest.java b/test/br/org/scadabr/db/dao/UsersProfileDaoTest.java
index b37225142d..94cbf39b4f 100644
--- a/test/br/org/scadabr/db/dao/UsersProfileDaoTest.java
+++ b/test/br/org/scadabr/db/dao/UsersProfileDaoTest.java
@@ -17,7 +17,7 @@
 import br.org.scadabr.db.dao.mocks.MockViewDao;
 import br.org.scadabr.db.dao.mocks.MockWatchlistDao;
 import br.org.scadabr.db.scenarios.DatalessDatabaseScenario;
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import br.org.scadabr.vo.permission.ViewAccess;
 import br.org.scadabr.vo.permission.WatchListAccess;
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
diff --git a/test/br/org/scadabr/view/component/GenerateAlarmListComponentTest.java b/test/br/org/scadabr/view/component/GenerateAlarmListComponentTest.java
index 0306b31aa8..1cc59623fb 100644
--- a/test/br/org/scadabr/view/component/GenerateAlarmListComponentTest.java
+++ b/test/br/org/scadabr/view/component/GenerateAlarmListComponentTest.java
@@ -16,6 +16,7 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.scada_lts.mango.service.EventService;
+import org.scada_lts.mango.service.SystemSettingsService;
 
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -39,6 +40,8 @@ public class GenerateAlarmListComponentTest {
     private WebContext webContext;
 
     private EventService eventService;
+    private SystemSettingsService systemSettingsService;
+
 
     @Mock
     private User user;
@@ -60,6 +63,10 @@ public void setup() throws Exception {
         eventService = PowerMockito.mock(EventService.class);
         whenNew(EventService.class).withNoArguments().thenReturn(eventService);
 
+        systemSettingsService = PowerMockito.mock(SystemSettingsService.class);
+        whenNew(SystemSettingsService.class).withNoArguments().thenReturn(systemSettingsService);
+
+
         subject = new AlarmListComponent();
     }
 
@@ -70,10 +77,7 @@ public void when_generateContent_with_eventsSubList_after_modifying_events_and_i
         CopyOnWriteArrayList<EventInstance> events = new CopyOnWriteArrayList<>();
         when(eventService.getPendingEvents(anyInt())).thenReturn(events);
 
-        HashMap<String, Object> model = new HashMap<>();
-        whenNew(HashMap.class).withNoArguments().thenReturn(model);
-
-        when(BaseDwr.generateContent(any(), any(), eq(model)))
+        when(BaseDwr.generateContent(any(), anyString(), anyMap()))
                 .thenAnswer(invocation -> {
                     Map<String, Object> modelArgs = (Map<String, Object>)invocation.getArguments()[2];
                     List<String> eventsSubList = (List<String>)modelArgs.get("events");
diff --git a/test/br/org/scadabr/vo/importer/UsersProfileImporterTest.java b/test/br/org/scadabr/vo/importer/UsersProfileImporterTest.java
index 19306d9f49..942206ffe6 100644
--- a/test/br/org/scadabr/vo/importer/UsersProfileImporterTest.java
+++ b/test/br/org/scadabr/vo/importer/UsersProfileImporterTest.java
@@ -18,7 +18,7 @@
 import br.org.scadabr.db.dao.mocks.MockViewDao;
 import br.org.scadabr.db.dao.mocks.MockWatchlistDao;
 import br.org.scadabr.db.scenarios.DatalessDatabaseScenario;
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import br.org.scadabr.vo.permission.ViewAccess;
 import br.org.scadabr.vo.permission.WatchListAccess;
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
diff --git a/test/br/org/scadabr/vo/usersProfiles/UsersProfileVOTest.java b/test/br/org/scadabr/vo/usersProfiles/UsersProfileVOTest.java
index a14291228f..93e590c49d 100644
--- a/test/br/org/scadabr/vo/usersProfiles/UsersProfileVOTest.java
+++ b/test/br/org/scadabr/vo/usersProfiles/UsersProfileVOTest.java
@@ -16,7 +16,7 @@
 import br.org.scadabr.db.dao.mocks.MockDataSourceDao;
 import br.org.scadabr.db.dao.mocks.MockViewDao;
 import br.org.scadabr.db.dao.mocks.MockWatchlistDao;
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import br.org.scadabr.vo.permission.ViewAccess;
 import br.org.scadabr.vo.permission.WatchListAccess;
 
diff --git a/test/com/serotonin/mango/rt/dataImage/datapointrt/config/ConfigDataPointRtTest.java b/test/com/serotonin/mango/rt/dataImage/datapointrt/config/ConfigDataPointRtTest.java
index 32c998c8d5..9e99bdcef8 100644
--- a/test/com/serotonin/mango/rt/dataImage/datapointrt/config/ConfigDataPointRtTest.java
+++ b/test/com/serotonin/mango/rt/dataImage/datapointrt/config/ConfigDataPointRtTest.java
@@ -1,6 +1,6 @@
 package com.serotonin.mango.rt.dataImage.datapointrt.config;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import com.serotonin.mango.Common;
 import com.serotonin.mango.db.dao.DataPointDao;
 import com.serotonin.mango.db.dao.DataSourceDao;
diff --git a/test/com/serotonin/mango/rt/dataSource/DataPointUnreliableUtilsTest.java b/test/com/serotonin/mango/rt/dataSource/DataPointUnreliableUtilsTest.java
new file mode 100644
index 0000000000..fc30139363
--- /dev/null
+++ b/test/com/serotonin/mango/rt/dataSource/DataPointUnreliableUtilsTest.java
@@ -0,0 +1,526 @@
+package com.serotonin.mango.rt.dataSource;
+
+import utils.TestUtils;
+import com.serotonin.db.IntValuePair;
+import com.serotonin.mango.Common;
+import com.serotonin.mango.db.dao.DataPointDao;
+import com.serotonin.mango.db.dao.PointValueDao;
+import com.serotonin.mango.rt.EventManager;
+import com.serotonin.mango.rt.RuntimeManager;
+import com.serotonin.mango.rt.dataImage.DataPointRT;
+import com.serotonin.mango.rt.dataImage.PointValueCache;
+import com.serotonin.mango.vo.DataPointVO;
+import com.serotonin.mango.vo.TimePeriodType;
+import com.serotonin.mango.vo.dataSource.meta.MetaDataSourceVO;
+import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
+import com.serotonin.mango.vo.dataSource.virtual.VirtualDataSourceVO;
+import com.serotonin.mango.vo.dataSource.virtual.VirtualPointLocatorVO;
+import com.serotonin.mango.web.dwr.MiscDwr;
+import com.serotonin.web.content.ContentGenerator;
+import org.directwebremoting.WebContextFactory;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.scada_lts.dao.SystemSettingsDAO;
+import org.scada_lts.web.beans.ApplicationBeans;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.*;
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.resetUnreliableDataPoints;
+import static com.serotonin.mango.util.InitializeDataSourceRtMockUtils.resetUnreliable;
+import static com.serotonin.mango.util.InitializeDataSourceRtMockUtils.setUnreliable;
+import static org.mockito.Mockito.mock;
+import static utils.mock.RuntimeMockUtils.runtimeManagerMock;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({WebContextFactory.class, Common.class, MiscDwr.class, SystemSettingsDAO.class,
+        ContentGenerator.class, PointValueCache.class, DataPointRT.class, RuntimeManager.class, DataPointDao.class,
+        PointValueDao.class, ApplicationBeans.class, PollingDataSource.class})
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*",
+        "javax.activation.*", "javax.management.*"})
+public class DataPointUnreliableUtilsTest {
+
+    private RuntimeManager runtimeManager;
+
+    private DataPointVO metaDataPoint1;
+    private DataPointVO metaDataPoint2;
+
+    private DataPointVO metaDataPoint6WithVirtualDataPoint1;
+    private DataPointVO metaDataPoint7WithVirtualDataPoint1;
+    private DataPointVO metaDataPoint8;
+    private DataPointVO metaDataPoint9WithVirtualDataPoint2;
+    private DataPointVO metaDataPoint10WithVirtualDataPoint1;
+
+    private DataPointVO virtualDataPoint1;
+    private DataPointVO virtualDataPoint2;
+
+    private MetaDataSourceVO metaDataSourceVO1;
+    private MetaDataSourceVO metaDataSourceVO2;
+    private VirtualDataSourceVO virtualDataSourceVO;
+
+    private final List<DataPointRT> metaDataPoints = new ArrayList<>();
+    private final List<DataPointRT> metaDataPointsWithContext = new ArrayList<>();
+    private final List<DataPointRT> virtualDataPoints = new ArrayList<>();
+
+
+    @Before
+    public void configMock() throws Exception {
+
+        runtimeManagerMock(this.runtimeManager = new RuntimeManager(), mock(EventManager.class));
+
+        configData();
+    }
+
+    private void configData() {
+
+        metaDataSourceVO1 = new MetaDataSourceVO();
+        metaDataSourceVO1.setId(123);
+        metaDataSourceVO1.setEnabled(true);
+        metaDataSourceVO1.setXid("TEST_DS_XID1");
+        metaDataSourceVO1.setName("Meta_Test1");
+
+        metaDataSourceVO2 = new MetaDataSourceVO();
+        metaDataSourceVO2.setId(345);
+        metaDataSourceVO2.setEnabled(true);
+        metaDataSourceVO2.setXid("TEST_DS_XID2");
+        metaDataSourceVO2.setName("Meta_Test2");
+
+        virtualDataSourceVO = new VirtualDataSourceVO();
+        virtualDataSourceVO.setEnabled(true);
+        virtualDataSourceVO.setId(567);
+        virtualDataSourceVO.setXid("TEST_DS_XID3");
+        virtualDataSourceVO.setName("Virtual_Test");
+        virtualDataSourceVO.setUpdatePeriods(1);
+        virtualDataSourceVO.setUpdatePeriodType(TimePeriodType.SECONDS.getCode());
+
+
+        metaDataPoint1 = TestUtils.newPointSettable(111, metaDataSourceVO1, -1, new MetaPointLocatorVO());
+        metaDataPoint1.setEnabled(true);
+
+        metaDataPoint2 = TestUtils.newPointSettable(112, metaDataSourceVO1, -1, new MetaPointLocatorVO());
+        metaDataPoint2.setEnabled(true);
+
+        MetaPointLocatorVO metaPointLocatorVO1 = new MetaPointLocatorVO();
+        metaPointLocatorVO1.setContext(Arrays.asList(new IntValuePair(117,""), new IntValuePair(121,"")));
+        metaDataPoint6WithVirtualDataPoint1 = TestUtils.newPointSettable(116, metaDataSourceVO2, -1, metaPointLocatorVO1);
+        metaDataPoint6WithVirtualDataPoint1.setEnabled(true);
+
+        MetaPointLocatorVO metaPointLocatorVO2 = new MetaPointLocatorVO();
+        metaPointLocatorVO2.setContext(Arrays.asList(new IntValuePair(118,""), new IntValuePair(121,"")));
+        metaDataPoint7WithVirtualDataPoint1 = TestUtils.newPointSettable(117, metaDataSourceVO2, -1, metaPointLocatorVO2);
+        metaDataPoint7WithVirtualDataPoint1.setEnabled(true);
+
+        MetaPointLocatorVO metaPointLocatorVO3 = new MetaPointLocatorVO();
+        metaPointLocatorVO3.setContext(Arrays.asList(new IntValuePair(119,"")));
+        metaDataPoint8 = TestUtils.newPointSettable(118, metaDataSourceVO2, -1, metaPointLocatorVO3);
+        metaDataPoint8.setEnabled(true);
+
+        MetaPointLocatorVO metaPointLocatorVO4 = new MetaPointLocatorVO();
+        metaPointLocatorVO4.setContext(Arrays.asList(new IntValuePair(120,""), new IntValuePair(122,"")));
+        metaDataPoint9WithVirtualDataPoint2 = TestUtils.newPointSettable(119, metaDataSourceVO2, -1, metaPointLocatorVO4);
+        metaDataPoint9WithVirtualDataPoint2.setEnabled(true);
+
+        MetaPointLocatorVO metaPointLocatorVO5 = new MetaPointLocatorVO();
+        metaPointLocatorVO5.setContext(Arrays.asList(new IntValuePair(118,""), new IntValuePair(121,"")));
+        metaDataPoint10WithVirtualDataPoint1 = TestUtils.newPointSettable(120, metaDataSourceVO2, -1, metaPointLocatorVO5);
+        metaDataPoint10WithVirtualDataPoint1.setEnabled(true);
+
+        virtualDataPoint1 = TestUtils.newPointSettable(121, virtualDataSourceVO, -1, new VirtualPointLocatorVO());
+        virtualDataPoint1.setEnabled(true);
+
+        virtualDataPoint2 = TestUtils.newPointSettable(122, virtualDataSourceVO, -1, new VirtualPointLocatorVO());
+        virtualDataPoint2.setEnabled(true);
+
+
+        runtimeManager.saveDataSource(metaDataSourceVO1);
+        runtimeManager.saveDataPoint(metaDataPoint1);
+        runtimeManager.saveDataPoint(metaDataPoint2);
+
+        runtimeManager.saveDataSource(metaDataSourceVO2);
+        runtimeManager.saveDataPoint(metaDataPoint8);
+        runtimeManager.saveDataPoint(metaDataPoint6WithVirtualDataPoint1);
+        runtimeManager.saveDataPoint(metaDataPoint7WithVirtualDataPoint1);
+        runtimeManager.saveDataPoint(metaDataPoint9WithVirtualDataPoint2);
+        runtimeManager.saveDataPoint(metaDataPoint10WithVirtualDataPoint1);
+
+        runtimeManager.saveDataSource(virtualDataSourceVO);
+        runtimeManager.saveDataPoint(virtualDataPoint1);
+        runtimeManager.saveDataPoint(virtualDataPoint2);
+
+
+        virtualDataPoints.add(runtimeManager.getDataPoint(virtualDataPoint1.getId()));
+        virtualDataPoints.add(runtimeManager.getDataPoint(virtualDataPoint2.getId()));
+
+        metaDataPoints.add(runtimeManager.getDataPoint(metaDataPoint1.getId()));
+        metaDataPoints.add(runtimeManager.getDataPoint(metaDataPoint2.getId()));
+
+        metaDataPointsWithContext.add(runtimeManager.getDataPoint(metaDataPoint6WithVirtualDataPoint1.getId()));
+        metaDataPointsWithContext.add(runtimeManager.getDataPoint(metaDataPoint7WithVirtualDataPoint1.getId()));
+        metaDataPointsWithContext.add(runtimeManager.getDataPoint(metaDataPoint8.getId()));
+        metaDataPointsWithContext.add(runtimeManager.getDataPoint(metaDataPoint9WithVirtualDataPoint2.getId()));
+        metaDataPointsWithContext.add(runtimeManager.getDataPoint(metaDataPoint10WithVirtualDataPoint1.getId()));
+
+    }
+
+    @Test
+    public void when_setUnreliableDataPoints_with_virtual_points_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+
+        //when:
+        setUnreliableDataPoints(virtualDataPoints);
+
+        //then:
+        for(DataPointRT dataPoint: virtualDataPoints) {
+            Assert.assertEquals(true, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_setUnreliableDataPoints_with_meta_points_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+
+        //when:
+        setUnreliableDataPoints(metaDataPoints);
+
+        //then:
+        for(DataPointRT dataPoint: metaDataPoints) {
+            Assert.assertEquals(true, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_setUnreliableDataPoints_with_meta_points_with_context_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+
+        //when:
+        setUnreliableDataPoints(metaDataPointsWithContext);
+
+        //then:
+        for(DataPointRT dataPoint: metaDataPointsWithContext) {
+            Assert.assertEquals(true, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_getRunningDataSource_virtual_data_source_then_initialized_true() {
+
+        //when:
+        DataSourceRT dataSourceRT = runtimeManager.getRunningDataSource(virtualDataSourceVO.getId());
+
+        //then:
+        Assert.assertEquals(true, dataSourceRT.isInitialized());
+
+    }
+
+    @Test
+    public void when_getRunningDataSource_meta_data_source_then_initialized_true() {
+
+        //when:
+        DataSourceRT dataSourceRT = runtimeManager.getRunningDataSource(metaDataSourceVO1.getId());
+
+        //then:
+        Assert.assertEquals(true, dataSourceRT.isInitialized());
+
+    }
+
+    @Test
+    public void when_getRunningDataSource_meta_data_source_with_context_then_initialized_true() {
+
+        //when:
+        DataSourceRT dataSourceRT = runtimeManager.getRunningDataSource(metaDataSourceVO2.getId());
+
+        //then:
+        Assert.assertEquals(true, dataSourceRT.isInitialized());
+
+    }
+
+    @Test
+    public void when_setUnreliableDataPoint_with_virtual_point_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(virtualDataPoint1.getId());
+
+        //when:
+        setUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(true, dataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_setUnreliableDataPoint_with_meta_point_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint1.getId());
+
+        //when:
+        setUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(true, dataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_setUnreliableDataPoint_with_meta_point_with_context_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint6WithVirtualDataPoint1.getId());
+
+        //when:
+        setUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(true, dataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_setUnreliableDataPoints_with_virtual_points_then_meta_points_unreliable_false() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+
+        //when:
+        setUnreliableDataPoints(virtualDataPoints);
+
+        //then:
+        for(DataPointRT dataPoint: metaDataPoints) {
+            Assert.assertEquals(false, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_setUnreliableDataPoints_with_virtual_points_from_meta_points_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+
+        //when:
+        setUnreliableDataPoints(virtualDataPoints);
+
+        //then:
+        for(DataPointRT dataPoint: metaDataPointsWithContext) {
+            Assert.assertEquals(true, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_setUnreliableDataPoint_with_meta_point_from_context_meta_points_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint10WithVirtualDataPoint1.getId());
+
+        //when:
+        setUnreliableDataPoint(dataPointRT);
+
+        //then:
+        for(DataPointRT dataPoint: metaDataPointsWithContext) {
+            Assert.assertEquals(true, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_setUnreliableDataPoint_with_meta_point_from_context_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint10WithVirtualDataPoint1.getId());
+
+        //when:
+        setUnreliableDataPoint(dataPointRT);
+
+        //then:
+        for(DataPointRT dataPoint: runtimeManager.getRunningMetaDataPoints(dataPointRT.getId())) {
+            Assert.assertEquals(true, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_setUnreliableDataPoints_with_virtual_points_from_context_meta_points_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+
+        //when:
+        setUnreliableDataPoints(virtualDataPoints);
+
+        //then:
+        for(DataPointRT dataPoint: metaDataPointsWithContext) {
+            Assert.assertEquals(true, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_setUnreliableDataPoint_with_virtual_point_from_context_meta_points_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(virtualDataPoint1.getId());
+
+        //when:
+        setUnreliableDataPoint(dataPointRT);
+
+        //then:
+        for(DataPointRT dataPoint: runtimeManager.getRunningMetaDataPoints(dataPointRT.getId())) {
+            Assert.assertEquals(true, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_setUnreliableDataPoint_with_virtual_point_from_context_meta_point_then_unreliable_true() {
+
+        //given:
+        resetUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(virtualDataPoint2.getId());
+        DataPointRT metaDataPointRT = runtimeManager.getDataPoint(metaDataPoint9WithVirtualDataPoint2.getId());
+
+        //when:
+        setUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(true, metaDataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_resetUnreliableDataPoint_with_virtual_point_then_unreliable_false() {
+
+        //given:
+        setUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(virtualDataPoint1.getId());
+
+        //when:
+        resetUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(false, dataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_resetUnreliableDataPoint_with_meta_point_then_unreliable_false() {
+
+        //given:
+        setUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint1.getId());
+
+        //when:
+        resetUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(false, dataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_resetUnreliableDataPoint_with_meta_point_with_context_then_unreliable_false() {
+
+        //given:
+        setUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint6WithVirtualDataPoint1.getId());
+
+        //when:
+        resetUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(false, dataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_resetUnreliableDataPoint_with_meta_point_from_context_meta_point_then_unreliable_false() {
+
+        //given:
+        setUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint10WithVirtualDataPoint1.getId());
+
+        //when:
+        resetUnreliableDataPoint(dataPointRT);
+
+        //then:
+        for(DataPointRT dataPoint: metaDataPointsWithContext) {
+            Assert.assertEquals(false, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_resetUnreliableDataPoints_with_meta_point_then_unreliable_false() {
+        
+        //given:
+        setUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint1.getId());
+
+        //when:
+        resetUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(false, dataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_resetUnreliableDataPoints_with_meta_points_then_unreliable_false() {
+
+        //given:
+        setUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(metaDataPoint1.getId());
+
+        //when:
+        resetUnreliableDataPoints(metaDataPoints);
+
+        //then:
+        Assert.assertEquals(false, dataPointRT.isUnreliable());
+
+    }
+
+    @Test
+    public void when_resetUnreliableDataPoints_with_virtual_point_from_context_meta_point_then_meta_points_unreliable_false() {
+
+        //given:
+        setUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(virtualDataPoint1.getId());
+
+        //when:
+        resetUnreliableDataPoint(dataPointRT);
+
+        //then:
+        for(DataPointRT dataPoint: runtimeManager.getRunningMetaDataPoints(dataPointRT.getId())) {
+            Assert.assertEquals(false, dataPoint.isUnreliable());
+        }
+    }
+
+    @Test
+    public void when_resetUnreliableDataPoints_with_virtual_point_from_context_meta_point_then_meta_point_unreliable_false() {
+
+        //given:
+        setUnreliable(virtualDataPoints, metaDataPoints, metaDataPointsWithContext);
+        DataPointRT dataPointRT = runtimeManager.getDataPoint(virtualDataPoint2.getId());
+        DataPointRT metaDataPointRT = runtimeManager.getDataPoint(metaDataPoint9WithVirtualDataPoint2.getId());
+
+        //when:
+        resetUnreliableDataPoint(dataPointRT);
+
+        //then:
+        Assert.assertEquals(false, metaDataPointRT.isUnreliable());
+
+    }
+}
\ No newline at end of file
diff --git a/test/com/serotonin/mango/rt/dataSource/InitializeDataSourceRtTest.java b/test/com/serotonin/mango/rt/dataSource/InitializeDataSourceRtTest.java
new file mode 100644
index 0000000000..1c004ab372
--- /dev/null
+++ b/test/com/serotonin/mango/rt/dataSource/InitializeDataSourceRtTest.java
@@ -0,0 +1,244 @@
+package com.serotonin.mango.rt.dataSource;
+
+import br.org.scadabr.rt.dataSource.alpha2.Alpha2DataSource;
+import br.org.scadabr.rt.dataSource.asciiFile.ASCIIFileDataSource;
+import br.org.scadabr.rt.dataSource.asciiSerial.ASCIISerialDataSource;
+import br.org.scadabr.rt.dataSource.dnp3.Dnp3IpDataSource;
+import br.org.scadabr.rt.dataSource.dnp3.Dnp3SerialDataSource;
+import br.org.scadabr.rt.dataSource.drStorageHt5b.DrStorageHt5bDataSource;
+import br.org.scadabr.rt.dataSource.iec101.IEC101EthernetDataSource;
+import br.org.scadabr.rt.dataSource.iec101.IEC101SerialDataSource;
+import br.org.scadabr.rt.dataSource.nodaves7.NodaveS7DataSource;
+import br.org.scadabr.rt.dataSource.opc.OPCDataSource;
+import br.org.scadabr.vo.dataSource.asciiFile.ASCIIFileDataSourceVO;
+import br.org.scadabr.vo.dataSource.nodaves7.NodaveS7DataSourceVO;
+import cc.radiuino.scadabr.rt.datasource.radiuino.RadiuinoEventDataSource;
+import cc.radiuino.scadabr.rt.datasource.radiuino.RadiuinoPollingDataSource;
+import com.i2msolucoes.alpha24j.layer.user.Alpha2Master;
+import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.EventManager;
+import com.serotonin.mango.rt.dataSource.bacnet.BACnetIPDataSourceRT;
+import com.serotonin.mango.rt.dataSource.ebro.EBI25Constants;
+import com.serotonin.mango.rt.dataSource.ebro.EBI25DataSourceRT;
+import com.serotonin.mango.rt.dataSource.galil.GalilDataSourceRT;
+import com.serotonin.mango.rt.dataSource.http.*;
+import com.serotonin.mango.rt.dataSource.internal.InternalDataSourceRT;
+import com.serotonin.mango.rt.dataSource.jmx.JmxDataSourceRT;
+import com.serotonin.mango.rt.dataSource.mbus.MBusDataSourceRT;
+import com.serotonin.mango.rt.dataSource.meta.MetaDataSourceRT;
+import com.serotonin.mango.rt.dataSource.modbus.ModbusIpDataSource;
+import com.serotonin.mango.rt.dataSource.modbus.ModbusSerialDataSource;
+import com.serotonin.mango.rt.dataSource.nmea.NmeaDataSourceRT;
+import com.serotonin.mango.rt.dataSource.onewire.OneWireDataSourceRT;
+import com.serotonin.mango.rt.dataSource.openv4j.OpenV4JDataSourceRT;
+import com.serotonin.mango.rt.dataSource.pachube.PachubeDataSourceRT;
+import com.serotonin.mango.rt.dataSource.persistent.PersistentDataSourceRT;
+import com.serotonin.mango.rt.dataSource.pop3.Pop3DataSourceRT;
+import com.serotonin.mango.rt.dataSource.snmp.SnmpDataSourceRT;
+import com.serotonin.mango.rt.dataSource.sql.SqlDataSourceRT;
+import com.serotonin.mango.rt.dataSource.viconics.ViconicsDataSourceRT;
+import com.serotonin.mango.rt.dataSource.virtual.VirtualDataSourceRT;
+import com.serotonin.mango.rt.dataSource.vmstat.VMStatDataSourceRT;
+import com.serotonin.mango.util.InitializeDataSourceRtMockUtils;
+import com.serotonin.mango.util.SqlDataSourceUtils;
+import com.serotonin.mango.util.timeout.TimeoutTask;
+import com.serotonin.mango.vo.dataSource.http.HttpImageDataSourceVO;
+import com.serotonin.mango.vo.dataSource.http.HttpRetrieverDataSourceVO;
+import com.serotonin.mango.vo.dataSource.internal.InternalDataSourceVO;
+import com.serotonin.mango.vo.dataSource.jmx.JmxDataSourceVO;
+import com.serotonin.mango.vo.dataSource.mbus.MBusDataSourceVO;
+import com.serotonin.mango.vo.dataSource.meta.MetaDataSourceVO;
+import com.serotonin.mango.vo.dataSource.openv4j.OpenV4JDataSourceVO;
+import com.serotonin.mango.vo.dataSource.persistent.PersistentDataSourceVO;
+import com.serotonin.mango.vo.dataSource.pop3.Pop3DataSourceVO;
+import com.serotonin.mango.vo.dataSource.virtual.VirtualDataSourceVO;
+import com.serotonin.mango.vo.dataSource.vmstat.VMStatDataSourceVO;
+import com.serotonin.mango.web.ContextWrapper;
+import com.serotonin.modbus4j.ModbusFactory;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+import org.scada_lts.ds.messaging.protocol.amqp.AmqpDataSourceVO;
+import org.scada_lts.ds.messaging.protocol.mqtt.MqttDataSourceVO;
+import org.scada_lts.serial.gnu.io.ScadaCommPortIdentifier;
+
+import org.springframework.security.web.savedrequest.Enumerator;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.function.Supplier;
+
+import static com.serotonin.mango.util.InitializeDataSourceRtMockUtils.supplier;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+
+
+@RunWith(PowerMockRunner.class)
+@PowerMockRunnerDelegate(Parameterized.class)
+@PrepareForTest({Common.class, ASCIISerialDataSource.class, ScadaCommPortIdentifier.class, Alpha2DataSource.class,
+        Alpha2Master.class, BACnetIPDataSourceRT.class, Dnp3IpDataSource.class, Dnp3SerialDataSource.class,
+        EBI25DataSourceRT.class, EBI25Constants.class, NmeaDataSourceRT.class, Runtime.class, VMStatDataSourceRT.class,
+        ViconicsDataSourceRT.class, GalilDataSourceRT.class, IEC101EthernetDataSource.class, IEC101SerialDataSource.class,
+        ModbusFactory.class, OPCDataSource.class, OneWireDataSourceRT.class, SqlDataSourceUtils.class, PollingDataSource.class})
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*",
+        "javax.activation.*", "javax.management.*"})
+public class InitializeDataSourceRtTest<T extends DataSourceRT> {
+
+    @Parameterized.Parameters(name = "{index}: data source: {0}, raiseEventTimes: {2}, returnToNormalTimes: {3}")
+    public static Object[][] data() throws Exception {
+
+        return new Object[][] {
+
+                {ASCIISerialDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createAsciiSerial), 1, 0},
+                {Alpha2DataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createAlpha2), 1, 0},
+                {BACnetIPDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createBacNet), 3, 0},
+                {Dnp3IpDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createDnp3Ip), 1, 0},
+                {Dnp3SerialDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createDnp3Serial), 1, 0},
+                {DrStorageHt5bDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createDrStorageMock), 1, 0},
+                {EBI25DataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createEbi25), 1, 0},
+                {NmeaDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createNmea), 1, 0},
+                {RadiuinoEventDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createRadiuino), 1, 0},
+                {RadiuinoPollingDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createRadiuinoPolling), 1, 0},
+                {VMStatDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtTest::createVmStat), 1, 0},
+                {ViconicsDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createViconics), 1, 0},
+                {GalilDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createGalil), 1, 0},
+                {IEC101EthernetDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createIec101Ethernet), 1, 0},
+                {IEC101SerialDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createIec101Serial), 1, 0},
+                {AmqpDataSourceVO.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createAmqp), 1, 0},
+                {MqttDataSourceVO.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createMqtt), 1, 0},
+                {ModbusIpDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createModbusIpDataSource), 1, 0},
+                {ModbusSerialDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createModbusSerialDataSource), 1, 0},
+                {OPCDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createOpc), 1, 0},
+                {OneWireDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createOneWire), 1, 0},
+                {SqlDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createSql), 1, 0},
+                {HttpReceiverDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createSql), 1, 0},
+                {PachubeDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createPachube), 1, 0},
+                {SnmpDataSourceRT.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createSnmp), 1, 0},
+                {PersistentDataSourceRT.class.getSimpleName(), supplier(() -> new PersistentDataSourceRT(new PersistentDataSourceVO())), 1, 0},
+                {ModbusIpDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createModbusIpDataSource), 1, 0},
+                {ModbusSerialDataSource.class.getSimpleName(), supplier(InitializeDataSourceRtMockUtils::createModbusSerialDataSource), 1, 0},
+
+
+                {VirtualDataSourceRT.class.getSimpleName(), supplier(() -> new VirtualDataSourceRT(new VirtualDataSourceVO())), 0, 0},
+                {ASCIIFileDataSource.class.getSimpleName(), supplier(() -> new ASCIIFileDataSource(new ASCIIFileDataSourceVO<>())), 0, 0},
+                {HttpImageDataSourceRT.class.getSimpleName(), supplier(() -> new HttpImageDataSourceRT(new HttpImageDataSourceVO())), 0, 0},
+                {HttpRetrieverDataSourceRT.class.getSimpleName(), supplier(() -> new HttpRetrieverDataSourceRT(new HttpRetrieverDataSourceVO())), 0, 0},
+                {InternalDataSourceRT.class.getSimpleName(), supplier(() -> new InternalDataSourceRT(new InternalDataSourceVO())), 0, 0},
+                {JmxDataSourceRT.class.getSimpleName(), supplier(() -> new JmxDataSourceRT(new JmxDataSourceVO())), 0, 0},
+                {MBusDataSourceRT.class.getSimpleName(), supplier(() -> new MBusDataSourceRT(new MBusDataSourceVO())), 0, 0},
+                {MetaDataSourceRT.class.getSimpleName(), supplier(() -> new MetaDataSourceRT(new MetaDataSourceVO())), 0, 0},
+                {NodaveS7DataSource.class.getSimpleName(), supplier(() -> new NodaveS7DataSource(new NodaveS7DataSourceVO<>())), 0, 0},
+                {OpenV4JDataSourceRT.class.getSimpleName(), supplier(() -> new OpenV4JDataSourceRT(new OpenV4JDataSourceVO())), 0, 0},
+                {Pop3DataSourceRT.class.getSimpleName(), supplier(() -> new Pop3DataSourceRT(new Pop3DataSourceVO())), 0, 0},
+
+        };
+    }
+
+    private DataSourceRT dataSourceRT;
+    private final int raiseEventTimes;
+    private final int returnToNormalTimes;
+    private final Supplier<T> mockConfig;
+
+    public InitializeDataSourceRtTest(String name, Supplier<T> mockConfig, int returnToNormalTimes, int raiseEventTimes) {
+        this.raiseEventTimes = raiseEventTimes;
+        this.returnToNormalTimes = returnToNormalTimes;
+        this.mockConfig = mockConfig;
+    }
+
+    private EventManager eventManager;
+
+    @Before
+    public void config() {
+        eventManager = mock(EventManager.class);
+        HttpReceiverMulticaster multicastListener = mock(HttpReceiverMulticaster.class);
+
+        ContextWrapper contextWrapper = mock(ContextWrapper.class);
+        when(contextWrapper.getEventManager()).thenReturn(eventManager);
+        when(contextWrapper.getHttpReceiverMulticaster()).thenReturn(multicastListener);
+
+        Common.ctx = contextWrapper;
+
+        PowerMockito.mockStatic(ScadaCommPortIdentifier.class);
+        when(ScadaCommPortIdentifier.getPortIdentifiers()).thenReturn(new Enumerator(new ArrayList()));
+
+        dataSourceRT = mockConfig.get();
+        reset(eventManager);
+    }
+
+    @After
+    public void clean() {
+        dataSourceRT.terminate();
+        reset(eventManager);
+    }
+
+    @Test
+    public void when_invoke_initialize_then_initialized() {
+
+        //when:
+        dataSourceRT.initialize();
+
+        //then:
+        Assert.assertEquals(true, dataSourceRT.isInitialized());
+    }
+
+
+    @Test
+    public void when_never_invoke_initialize_then_not_initialized() {
+
+        //then:
+        Assert.assertEquals(false, dataSourceRT.isInitialized());
+    }
+
+    @Test
+    public void when_invoke_initialize_then_invoke_returnToNormal_times() {
+
+        //when:
+        dataSourceRT.initialize();
+
+        //then:
+        Mockito.verify(eventManager, times(returnToNormalTimes)).returnToNormal(any(), anyLong());
+    }
+
+    @Test
+    public void when_invoke_initialize_with_errors_then_invoke_raiseEvent_times() {
+
+        //when:
+        dataSourceRT.initialize();
+
+        //then:
+        Mockito.verify(eventManager, times(raiseEventTimes)).raiseEvent(any(), anyLong(), anyBoolean(), anyInt(), any(), anyMap());
+    }
+
+    public static DataSourceRT createVmStat() {
+        InputStream inputStreamMock = mock(InputStream.class);
+        Process processMock = mock(Process.class);
+        when(processMock.getInputStream()).thenReturn(inputStreamMock);
+
+        java.lang.Runtime runtimeMock = mock(Runtime.class);
+        try {
+            when(runtimeMock.exec(anyString())).thenReturn(processMock);
+            PowerMockito.mockStatic(java.lang.Runtime.class);
+            when(java.lang.Runtime.getRuntime()).thenReturn(runtimeMock);
+
+            BufferedReader bufferedReader = mock(BufferedReader.class);
+            when(bufferedReader.readLine()).thenReturn("abc");
+            PowerMockito.whenNew(BufferedReader.class).withAnyArguments()
+                    .thenReturn(bufferedReader);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return new VMStatDataSourceRT(new VMStatDataSourceVO());
+    }
+}
diff --git a/test/com/serotonin/mango/rt/dataSource/InitializeDataSourceRtTestsSuite.java b/test/com/serotonin/mango/rt/dataSource/InitializeDataSourceRtTestsSuite.java
new file mode 100644
index 0000000000..fb1f98a238
--- /dev/null
+++ b/test/com/serotonin/mango/rt/dataSource/InitializeDataSourceRtTestsSuite.java
@@ -0,0 +1,12 @@
+package com.serotonin.mango.rt.dataSource;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        InitializeDataSourceRtTest.class,
+        //InitializeWithErrorsDataSourceRtTest.class
+})
+public class InitializeDataSourceRtTestsSuite {
+}
diff --git a/test/com/serotonin/mango/rt/dataSource/InitializeWithErrorsDataSourceRtTest.java b/test/com/serotonin/mango/rt/dataSource/InitializeWithErrorsDataSourceRtTest.java
new file mode 100644
index 0000000000..085e3130bc
--- /dev/null
+++ b/test/com/serotonin/mango/rt/dataSource/InitializeWithErrorsDataSourceRtTest.java
@@ -0,0 +1,243 @@
+package com.serotonin.mango.rt.dataSource;
+
+import br.org.scadabr.rt.dataSource.alpha2.Alpha2DataSource;
+import br.org.scadabr.rt.dataSource.asciiSerial.ASCIISerialDataSource;
+import br.org.scadabr.rt.dataSource.dnp3.Dnp3IpDataSource;
+import br.org.scadabr.rt.dataSource.dnp3.Dnp3SerialDataSource;
+import br.org.scadabr.rt.dataSource.drStorageHt5b.DrStorageHt5bDataSource;
+import br.org.scadabr.rt.dataSource.iec101.IEC101EthernetDataSource;
+import br.org.scadabr.rt.dataSource.iec101.IEC101SerialDataSource;
+import br.org.scadabr.rt.dataSource.opc.OPCDataSource;
+import br.org.scadabr.vo.dataSource.alpha2.Alpha2DataSourceVO;
+import br.org.scadabr.vo.dataSource.asciiSerial.ASCIISerialDataSourceVO;
+import br.org.scadabr.vo.dataSource.dnp3.Dnp3IpDataSourceVO;
+import br.org.scadabr.vo.dataSource.dnp3.Dnp3SerialDataSourceVO;
+import br.org.scadabr.vo.dataSource.drStorageHt5b.DrStorageHt5bDataSourceVO;
+import br.org.scadabr.vo.dataSource.iec101.IEC101EthernetDataSourceVO;
+import br.org.scadabr.vo.dataSource.iec101.IEC101SerialDataSourceVO;
+import br.org.scadabr.vo.dataSource.opc.OPCDataSourceVO;
+import cc.radiuino.scadabr.rt.datasource.radiuino.RadiuinoEventDataSource;
+import cc.radiuino.scadabr.rt.datasource.radiuino.RadiuinoPollingDataSource;
+import cc.radiuino.scadabr.vo.datasource.radiuino.RadiuinoDataSourceVO;
+import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.EventManager;
+import com.serotonin.mango.rt.dataSource.bacnet.BACnetIPDataSourceRT;
+import com.serotonin.mango.rt.dataSource.ebro.EBI25DataSourceRT;
+import com.serotonin.mango.rt.dataSource.galil.GalilDataSourceRT;
+import com.serotonin.mango.rt.dataSource.http.HttpReceiverDataSourceRT;
+import com.serotonin.mango.rt.dataSource.modbus.ModbusIpDataSource;
+import com.serotonin.mango.rt.dataSource.modbus.ModbusSerialDataSource;
+import com.serotonin.mango.rt.dataSource.nmea.NmeaDataSourceRT;
+import com.serotonin.mango.rt.dataSource.onewire.OneWireDataSourceRT;
+import com.serotonin.mango.rt.dataSource.pachube.PachubeDataSourceRT;
+import com.serotonin.mango.rt.dataSource.persistent.PersistentDataSourceRT;
+import com.serotonin.mango.rt.dataSource.snmp.SnmpDataSourceRT;
+import com.serotonin.mango.rt.dataSource.sql.SqlDataSourceRT;
+import com.serotonin.mango.rt.dataSource.viconics.ViconicsDataSourceRT;
+import com.serotonin.mango.rt.dataSource.vmstat.VMStatDataSourceRT;
+import com.serotonin.mango.util.timeout.TimeoutTask;
+import com.serotonin.mango.vo.dataSource.bacnet.BACnetIPDataSourceVO;
+import com.serotonin.mango.vo.dataSource.ebro.EBI25DataSourceVO;
+import com.serotonin.mango.vo.dataSource.galil.GalilDataSourceVO;
+import com.serotonin.mango.vo.dataSource.http.HttpReceiverDataSourceVO;
+import com.serotonin.mango.vo.dataSource.modbus.ModbusIpDataSourceVO;
+import com.serotonin.mango.vo.dataSource.modbus.ModbusSerialDataSourceVO;
+import com.serotonin.mango.vo.dataSource.nmea.NmeaDataSourceVO;
+import com.serotonin.mango.vo.dataSource.onewire.OneWireDataSourceVO;
+import com.serotonin.mango.vo.dataSource.pachube.PachubeDataSourceVO;
+import com.serotonin.mango.vo.dataSource.persistent.PersistentDataSourceVO;
+import com.serotonin.mango.vo.dataSource.snmp.SnmpDataSourceVO;
+import com.serotonin.mango.vo.dataSource.sql.SqlDataSourceVO;
+import com.serotonin.mango.vo.dataSource.viconics.ViconicsDataSourceVO;
+import com.serotonin.mango.vo.dataSource.vmstat.VMStatDataSourceVO;
+import com.serotonin.mango.web.ContextWrapper;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+import org.scada_lts.ds.messaging.MessagingDataSourceRT;
+import org.scada_lts.ds.messaging.exception.MessagingServiceException;
+import org.scada_lts.ds.messaging.protocol.amqp.AmqpDataSourceVO;
+import org.scada_lts.ds.messaging.protocol.mqtt.MqttDataSourceVO;
+import org.scada_lts.ds.messaging.service.MessagingService;
+import org.scada_lts.ds.messaging.service.MessagingServiceFactory;
+import org.scada_lts.web.beans.ApplicationBeans;
+import utils.mock.MockUtils;
+
+import java.io.IOException;
+import java.util.function.Supplier;
+
+import static com.serotonin.mango.util.InitializeDataSourceRtMockUtils.supplier;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+
+
+@RunWith(PowerMockRunner.class)
+@PowerMockRunnerDelegate(Parameterized.class)
+@PrepareForTest({Common.class, Runtime.class, VMStatDataSourceRT.class, PollingDataSource.class, ApplicationBeans.class})
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*",
+        "javax.activation.*", "javax.management.*"})
+public class InitializeWithErrorsDataSourceRtTest {
+
+    @Parameterized.Parameters(name = "{index}: data source: {1}")
+    public static Object[][] data() {
+        PersistentDataSourceVO persistentDataSourceVO = new PersistentDataSourceVO();
+        persistentDataSourceVO.setPort(-1);
+
+        ModbusIpDataSourceVO modbusIpDataSourceVO = new ModbusIpDataSourceVO();
+        modbusIpDataSourceVO.setTransportType(ModbusIpDataSourceVO.TransportType.TCP_KEEP_ALIVE);
+
+        BACnetIPDataSourceVO baCnetIPDataSourceVO = new BACnetIPDataSourceVO();
+        baCnetIPDataSourceVO.setPort(47808);
+
+        AmqpDataSourceVO amqpDataSourceVO = new AmqpDataSourceVO();
+        MqttDataSourceVO mqttDataSourceVO = new MqttDataSourceVO();
+        mqttDataSourceVO.setServerHost("localhost");
+        mqttDataSourceVO.setServerPortNumber(1234);
+
+        ModbusSerialDataSourceVO modbusSerialDataSourceVO = new ModbusSerialDataSourceVO();
+        modbusSerialDataSourceVO.setCommPortId("123");
+
+        MessagingService messageServiceMock = mock(MessagingService.class);
+        doAnswer(a -> {
+            throw new MessagingServiceException("From test");
+        }).when(messageServiceMock).open();
+
+        return new Object[][] {
+
+                {supplier(() -> new ASCIISerialDataSource(new ASCIISerialDataSourceVO<>())), ASCIISerialDataSource.class.getSimpleName()},
+                {supplier(() -> new Alpha2DataSource(new Alpha2DataSourceVO<>())), Alpha2DataSource.class.getSimpleName()},
+                {supplier(() -> new BACnetIPDataSourceRT(baCnetIPDataSourceVO)), BACnetIPDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new Dnp3IpDataSource(new Dnp3IpDataSourceVO())), Dnp3IpDataSource.class.getSimpleName()},
+                {supplier(() -> new Dnp3SerialDataSource(new Dnp3SerialDataSourceVO())), Dnp3SerialDataSource.class.getSimpleName()},
+                {supplier(() -> new DrStorageHt5bDataSource(new DrStorageHt5bDataSourceVO<>())), DrStorageHt5bDataSource.class.getSimpleName()},
+                {supplier(() -> new EBI25DataSourceRT(new EBI25DataSourceVO())), EBI25DataSourceRT.class.getSimpleName()},
+                {supplier(() -> new NmeaDataSourceRT(new NmeaDataSourceVO())), NmeaDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new RadiuinoEventDataSource(new RadiuinoDataSourceVO<>())), RadiuinoEventDataSource.class.getSimpleName()},
+                {supplier(() -> new RadiuinoPollingDataSource(new RadiuinoDataSourceVO<>())), RadiuinoPollingDataSource.class.getSimpleName()},
+                {supplier(() -> new VMStatDataSourceRT(new VMStatDataSourceVO())), VMStatDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new ViconicsDataSourceRT(new ViconicsDataSourceVO())), ViconicsDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new GalilDataSourceRT(new GalilDataSourceVO())), GalilDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new IEC101EthernetDataSource(new IEC101EthernetDataSourceVO())), IEC101EthernetDataSource.class.getSimpleName()},
+                {supplier(() -> new IEC101SerialDataSource(new IEC101SerialDataSourceVO())), IEC101SerialDataSource.class.getSimpleName()},
+                {supplier(() -> new MessagingDataSourceRT(amqpDataSourceVO, MessagingServiceFactory.newService(amqpDataSourceVO))), AmqpDataSourceVO.class.getSimpleName()},
+                {supplier(() -> new MessagingDataSourceRT(mqttDataSourceVO, messageServiceMock)), MqttDataSourceVO.class.getSimpleName()},
+
+                {supplier(() -> new ModbusSerialDataSource(new ModbusSerialDataSourceVO())), ModbusSerialDataSource.class.getSimpleName()},
+                {supplier(() -> new ModbusIpDataSource(modbusIpDataSourceVO)), ModbusIpDataSource.class.getSimpleName()},
+                {supplier(() -> new OPCDataSource(new OPCDataSourceVO<>())), OPCDataSource.class.getSimpleName()},
+                {supplier(() -> new OneWireDataSourceRT(new OneWireDataSourceVO())), OneWireDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new SqlDataSourceRT(new SqlDataSourceVO())), SqlDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new HttpReceiverDataSourceRT(new HttpReceiverDataSourceVO())), HttpReceiverDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new PachubeDataSourceRT(new PachubeDataSourceVO())), PachubeDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new SnmpDataSourceRT(new SnmpDataSourceVO())), SnmpDataSourceRT.class.getSimpleName()},
+                {supplier(() -> new PersistentDataSourceRT(persistentDataSourceVO)), PersistentDataSourceRT.class.getSimpleName()},
+
+        };
+    }
+
+    private DataSourceRT dataSourceRT;
+    private final Supplier<DataSourceRT> createDataSource;
+
+    public InitializeWithErrorsDataSourceRtTest(Supplier<DataSourceRT> createDataSource, String name) {
+        this.createDataSource = createDataSource;
+    }
+
+    private EventManager eventManager;
+
+    @Before
+    public void config() throws Exception {
+
+        MockUtils.configDaoMock();
+
+        eventManager = PowerMockito.mock(EventManager.class);
+
+        ContextWrapper contextWrapper = PowerMockito.mock(ContextWrapper.class);
+        PowerMockito.when(contextWrapper.getEventManager()).thenReturn(eventManager);
+
+        Common.ctx = contextWrapper;
+
+        this.dataSourceRT = this.createDataSource.get();
+
+        if(dataSourceRT instanceof BACnetIPDataSourceRT) {
+            DataSourceRT dataSourceRT1 = this.createDataSource.get();
+            dataSourceRT1.initialize();
+        }
+
+        TimeoutTask timeoutTaskMock = mock(TimeoutTask.class);
+        try {
+            whenNew(TimeoutTask.class).withAnyArguments()
+                    .thenReturn(timeoutTaskMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        reset(eventManager);
+
+        if(dataSourceRT instanceof VMStatDataSourceRT) {
+            java.lang.Runtime runtimeMock = mock(Runtime.class);
+            try {
+                doAnswer(a -> {
+                    throw new IOException("From test");
+                }).when(runtimeMock).exec(anyString());
+                PowerMockito.mockStatic(java.lang.Runtime.class);
+                when(java.lang.Runtime.getRuntime()).thenReturn(runtimeMock);
+
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @After
+    public void clean() {
+        dataSourceRT.terminate();
+    }
+
+    @Test
+    public void when_invoke_initialize_with_errors_then_not_initialized() {
+
+        //when:
+        dataSourceRT.initialize();
+
+        //then:
+        Assert.assertEquals(false, dataSourceRT.isInitialized());
+    }
+
+    @Test
+    public void when_never_invoke_initialize_then_not_initialized() {
+
+        //then:
+        Assert.assertEquals(false, dataSourceRT.isInitialized());
+    }
+
+    @Test
+    public void when_invoke_initialize_with_errors_then_one_raiseEvent() {
+
+        //when:
+        dataSourceRT.initialize();
+
+        //then:
+        Mockito.verify(eventManager, times(1)).raiseEvent(any(), anyLong(), anyBoolean(), anyInt(), any(), anyMap());
+    }
+
+    @Test
+    public void when_invoke_initialize_with_errors_then_never_returnToNormal() {
+
+        //when:
+        dataSourceRT.initialize();
+
+        //then:
+        Mockito.verify(eventManager, never()).returnToNormal(any(), anyLong());
+    }
+}
diff --git a/test/com/serotonin/mango/rt/scripting/ScriptTest.java b/test/com/serotonin/mango/rt/scripting/ScriptTest.java
index 0c661feb73..809ad9691f 100644
--- a/test/com/serotonin/mango/rt/scripting/ScriptTest.java
+++ b/test/com/serotonin/mango/rt/scripting/ScriptTest.java
@@ -135,12 +135,14 @@ public ScriptTest(MangoValue mangoValue,
         this.script = script;
     }
 
-    private RuntimeManager runtimeManager = mock(RuntimeManager.class);
-    private DPCommandsScriptContextObject scriptContextObject = mock(DPCommandsScriptContextObject.class);
+    private RuntimeManager runtimeManager;
+    private DPCommandsScriptContextObject scriptContextObject;
 
     @Before
     public void config() throws Exception {
-        ScriptTestUtils.configMock(runtimeManager, scriptContextObject);
+        runtimeManager = mock(RuntimeManager.class);
+        scriptContextObject = mock(DPCommandsScriptContextObject.class);
+        ScriptTestUtils.configScriptMock(runtimeManager, scriptContextObject);
     }
 
     @Test
diff --git a/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextEnableDisableDataPointTest.java b/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextEnableDisableDataPointTest.java
index 92ae1e075c..d82f7e4b65 100644
--- a/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextEnableDisableDataPointTest.java
+++ b/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextEnableDisableDataPointTest.java
@@ -42,14 +42,17 @@
         "javax.activation.*", "javax.management.*"})
 public class ScriptWithObjectContextEnableDisableDataPointTest {
 
-    private static String pointToChangeXid = "DP_093765";
-    private final List<IntValuePair> objectContext = Arrays.asList(new IntValuePair(2, "dp"));
-    private RuntimeManager runtimeManager = mock(RuntimeManager.class);
-    private DPCommandsScriptContextObject scriptContextObject = mock(DPCommandsScriptContextObject.class);
+    private static final String pointToChangeXid = "DP_093765";
+    private List<IntValuePair> objectContext;
+    private RuntimeManager runtimeManager;
+    private DPCommandsScriptContextObject scriptContextObject;
 
     @Before
     public void config() throws Exception {
-        ScriptTestUtils.configMock(runtimeManager, scriptContextObject);
+        objectContext = Arrays.asList(new IntValuePair(2, "dp"));
+        runtimeManager = mock(RuntimeManager.class);
+        scriptContextObject = mock(DPCommandsScriptContextObject.class);
+        ScriptTestUtils.configScriptMock(runtimeManager, scriptContextObject);
     }
 
     @After
diff --git a/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextEnableDisableDataSourceTest.java b/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextEnableDisableDataSourceTest.java
index 87c831c8ad..fb5dcad504 100644
--- a/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextEnableDisableDataSourceTest.java
+++ b/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextEnableDisableDataSourceTest.java
@@ -39,16 +39,19 @@
         "javax.activation.*", "javax.management.*"})
 public class ScriptWithObjectContextEnableDisableDataSourceTest {
 
-    private static String sourceToChangeXid = "DP_093765";
+    private static final String sourceToChangeXid = "DP_093765";
 
-    private final List<IntValuePair> objectContext = Arrays.asList(new IntValuePair(1, "ds"));
+    private List<IntValuePair> objectContext;
 
-    private RuntimeManager runtimeManager = mock(RuntimeManager.class);
-    private DSCommandsScriptContextObject scriptContextObject = mock(DSCommandsScriptContextObject.class);
+    private RuntimeManager runtimeManager;
+    private DSCommandsScriptContextObject scriptContextObject;
 
     @Before
     public void config() throws Exception {
-        ScriptTestUtils.configMock(runtimeManager, scriptContextObject);
+        objectContext = Arrays.asList(new IntValuePair(2, "ds"));
+        runtimeManager = mock(RuntimeManager.class);
+        scriptContextObject = mock(DSCommandsScriptContextObject.class);
+        ScriptTestUtils.configScriptMock(runtimeManager, scriptContextObject);
     }
 
     @After
diff --git a/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextWriteDataPointTest.java b/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextWriteDataPointTest.java
index ba02101a6b..2fa57b8a70 100644
--- a/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextWriteDataPointTest.java
+++ b/test/com/serotonin/mango/rt/scripting/ScriptWithObjectContextWriteDataPointTest.java
@@ -125,12 +125,14 @@ public ScriptWithObjectContextWriteDataPointTest(MangoValue mangoValue,
         this.script = script;
     }
 
-    private RuntimeManager runtimeManager = mock(RuntimeManager.class);
-    private DPCommandsScriptContextObject scriptContextObject = mock(DPCommandsScriptContextObject.class);
+    private RuntimeManager runtimeManager;
+    private DPCommandsScriptContextObject scriptContextObject;
 
     @Before
     public void config() throws Exception {
-        ScriptTestUtils.configMock(runtimeManager, scriptContextObject);
+        runtimeManager = mock(RuntimeManager.class);
+        scriptContextObject = mock(DPCommandsScriptContextObject.class);
+        ScriptTestUtils.configScriptMock(runtimeManager, scriptContextObject);
     }
 
     @After
diff --git a/test/com/serotonin/mango/util/AbstractStartStopDataPointsUtilsTest.java b/test/com/serotonin/mango/util/AbstractStartStopDataPointsUtilsTest.java
index f1431d9638..d28d6f0897 100644
--- a/test/com/serotonin/mango/util/AbstractStartStopDataPointsUtilsTest.java
+++ b/test/com/serotonin/mango/util/AbstractStartStopDataPointsUtilsTest.java
@@ -1,6 +1,6 @@
 package com.serotonin.mango.util;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import com.serotonin.mango.rt.dataSource.DataSourceRT;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
diff --git a/test/com/serotonin/mango/util/InitializeDataSourceRtMockUtils.java b/test/com/serotonin/mango/util/InitializeDataSourceRtMockUtils.java
new file mode 100644
index 0000000000..c3b011cebc
--- /dev/null
+++ b/test/com/serotonin/mango/util/InitializeDataSourceRtMockUtils.java
@@ -0,0 +1,477 @@
+package com.serotonin.mango.util;
+
+import br.org.scadabr.RealOPCMaster;
+import br.org.scadabr.rt.dataSource.alpha2.Alpha2DataSource;
+import br.org.scadabr.rt.dataSource.asciiSerial.ASCIISerialDataSource;
+import br.org.scadabr.rt.dataSource.dnp3.DNP3Master;
+import br.org.scadabr.rt.dataSource.dnp3.Dnp3DataSource;
+import br.org.scadabr.rt.dataSource.dnp3.Dnp3IpDataSource;
+import br.org.scadabr.rt.dataSource.dnp3.Dnp3SerialDataSource;
+import br.org.scadabr.rt.dataSource.drStorageHt5b.DrStorageHt5bDataSource;
+import br.org.scadabr.rt.dataSource.iec101.IEC101DataSource;
+import br.org.scadabr.rt.dataSource.iec101.IEC101EthernetDataSource;
+import br.org.scadabr.rt.dataSource.iec101.IEC101Master;
+import br.org.scadabr.rt.dataSource.iec101.IEC101SerialDataSource;
+import br.org.scadabr.rt.dataSource.opc.OPCDataSource;
+import br.org.scadabr.vo.dataSource.alpha2.Alpha2DataSourceVO;
+import br.org.scadabr.vo.dataSource.asciiSerial.ASCIISerialDataSourceVO;
+import br.org.scadabr.vo.dataSource.dnp3.Dnp3IpDataSourceVO;
+import br.org.scadabr.vo.dataSource.dnp3.Dnp3SerialDataSourceVO;
+import br.org.scadabr.vo.dataSource.drStorageHt5b.DrStorageHt5bDataSourceVO;
+import br.org.scadabr.vo.dataSource.iec101.IEC101EthernetDataSourceVO;
+import br.org.scadabr.vo.dataSource.iec101.IEC101SerialDataSourceVO;
+import br.org.scadabr.vo.dataSource.opc.OPCDataSourceVO;
+import cc.radiuino.scadabr.rt.datasource.radiuino.RadiuinoEventDataSource;
+import cc.radiuino.scadabr.rt.datasource.radiuino.RadiuinoPollingDataSource;
+import cc.radiuino.scadabr.vo.datasource.radiuino.RadiuinoDataSourceVO;
+import com.i2msolucoes.alpha24j.layer.user.Alpha2Master;
+import com.serotonin.bacnet4j.LocalDevice;
+import com.serotonin.bacnet4j.event.DeviceEventHandler;
+import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.dataImage.DataPointRT;
+import com.serotonin.mango.rt.dataSource.bacnet.BACnetIPDataSourceRT;
+import com.serotonin.mango.rt.dataSource.ebro.EBI25Constants;
+import com.serotonin.mango.rt.dataSource.ebro.EBI25DataSourceRT;
+import com.serotonin.mango.rt.dataSource.galil.GalilDataSourceRT;
+import com.serotonin.mango.rt.dataSource.galil.GalilRequest;
+import com.serotonin.mango.rt.dataSource.galil.GalilResponse;
+import com.serotonin.mango.rt.dataSource.modbus.ModbusDataSource;
+import com.serotonin.mango.rt.dataSource.modbus.ModbusIpDataSource;
+import com.serotonin.mango.rt.dataSource.modbus.ModbusSerialDataSource;
+import com.serotonin.mango.rt.dataSource.nmea.NmeaDataSourceRT;
+import com.serotonin.mango.rt.dataSource.nmea.NmeaReceiver;
+import com.serotonin.mango.rt.dataSource.onewire.Network;
+import com.serotonin.mango.rt.dataSource.onewire.OneWireDataSourceRT;
+import com.serotonin.mango.rt.dataSource.pachube.PachubeDataSourceRT;
+import com.serotonin.mango.rt.dataSource.snmp.SnmpDataSourceRT;
+import com.serotonin.mango.rt.dataSource.sql.SqlDataSourceRT;
+import com.serotonin.mango.rt.dataSource.viconics.ViconicsDataSourceRT;
+import com.serotonin.mango.util.timeout.TimeoutTask;
+import com.serotonin.mango.vo.DataPointVO;
+import com.serotonin.mango.vo.dataSource.DataSourceVO;
+import com.serotonin.mango.vo.dataSource.bacnet.BACnetIPDataSourceVO;
+import com.serotonin.mango.vo.dataSource.ebro.EBI25DataSourceVO;
+import com.serotonin.mango.vo.dataSource.galil.GalilDataSourceVO;
+import com.serotonin.mango.vo.dataSource.modbus.ModbusIpDataSourceVO;
+import com.serotonin.mango.vo.dataSource.modbus.ModbusSerialDataSourceVO;
+import com.serotonin.mango.vo.dataSource.nmea.NmeaDataSourceVO;
+import com.serotonin.mango.vo.dataSource.onewire.OneWireDataSourceVO;
+import com.serotonin.mango.vo.dataSource.pachube.PachubeDataSourceVO;
+import com.serotonin.mango.vo.dataSource.snmp.SnmpDataSourceVO;
+import com.serotonin.mango.vo.dataSource.sql.SqlDataSourceVO;
+import com.serotonin.mango.vo.dataSource.viconics.ViconicsDataSourceVO;
+import com.serotonin.messaging.MessageControl;
+import com.serotonin.messaging.StreamTransport;
+import com.serotonin.modbus4j.ModbusMaster;
+import com.serotonin.modbus4j.exception.ModbusInitException;
+import com.serotonin.modbus4j.ip.tcp.TcpMaster;
+import com.serotonin.modbus4j.serial.ascii.AsciiMaster;
+import com.serotonin.modbus4j.serial.rtu.RtuMaster;
+import com.serotonin.viconics.ViconicsNetwork;
+import gnu.io.SerialPort;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.params.HttpClientParams;
+import org.scada_lts.ds.messaging.MessagingDataSourceRT;
+import org.scada_lts.ds.messaging.protocol.amqp.AmqpDataSourceVO;
+import org.scada_lts.ds.messaging.protocol.mqtt.MqttDataSourceVO;
+import org.scada_lts.ds.messaging.service.MessagingService;
+import org.scada_lts.ds.messaging.service.MessagingServiceFactory;
+import org.snmp4j.mp.SnmpConstants;
+import org.springframework.jdbc.core.JdbcOperations;
+
+import javax.naming.NamingException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.resetUnreliableDataPoints;
+import static com.serotonin.mango.rt.dataSource.DataPointUnreliableUtils.setUnreliableDataPoints;
+import static org.mockito.ArgumentMatchers.*;
+import static org.powermock.api.mockito.PowerMockito.*;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+
+public final class InitializeDataSourceRtMockUtils {
+
+    private InitializeDataSourceRtMockUtils() {}
+
+    public static SqlDataSourceRT createSql() {
+        SqlDataSourceRT dataSource = new SqlDataSourceRT(new SqlDataSourceVO());
+        sqlMock(dataSource);
+        return dataSource;
+    }
+
+    public static OneWireDataSourceRT createOneWire() {
+        OneWireDataSourceRT dataSource = new OneWireDataSourceRT(new OneWireDataSourceVO());
+        oneWireMock(dataSource);
+        return dataSource;
+    }
+
+    public static OPCDataSource createOpc() {
+        OPCDataSource dataSource = new OPCDataSource(new OPCDataSourceVO<>());
+        opcMock(dataSource);
+        return dataSource;
+    }
+
+    public static ModbusDataSource createModbusIpDataSource() {
+        ModbusDataSource dataSource = new ModbusIpDataSource(new ModbusIpDataSourceVO());
+        modbusMock(dataSource);
+        return dataSource;
+    }
+
+    public static ModbusDataSource createModbusSerialDataSource() {
+        ModbusDataSource dataSource = new ModbusSerialDataSource(new ModbusSerialDataSourceVO());
+        modbusMock(dataSource);
+        return dataSource;
+    }
+
+    public static IEC101DataSource createIec101Ethernet() {
+        IEC101DataSource dataSource = new IEC101EthernetDataSource(new IEC101EthernetDataSourceVO());
+        iec101Mock(dataSource);
+        return dataSource;
+    }
+
+    public static IEC101DataSource createIec101Serial() {
+        IEC101DataSource dataSource = new IEC101SerialDataSource(new IEC101SerialDataSourceVO());
+        iec101Mock(dataSource);
+        return dataSource;
+    }
+
+    public static ViconicsDataSourceRT createViconics() {
+        ViconicsDataSourceRT dataSource = new ViconicsDataSourceRT(new ViconicsDataSourceVO());
+        viconicsMock(dataSource);
+        return dataSource;
+    }
+
+    public static NmeaDataSourceRT createNmea() {
+        NmeaDataSourceRT dataSource = new NmeaDataSourceRT(new NmeaDataSourceVO());
+        nmeaMock(dataSource);
+        return dataSource;
+    }
+
+    public static EBI25DataSourceRT createEbi25() {
+        EBI25DataSourceRT dataSource = new EBI25DataSourceRT(new EBI25DataSourceVO());
+        ebi25Mock(dataSource);
+        return dataSource;
+    }
+
+    public static Alpha2DataSource createAlpha2() {
+        Alpha2DataSource dataSource = new Alpha2DataSource(new Alpha2DataSourceVO<>());
+        alpha2Mock(dataSource);
+        return dataSource;
+    }
+
+    public static Dnp3DataSource createDnp3Ip() {
+        Dnp3DataSource dataSource = new Dnp3IpDataSource(new Dnp3IpDataSourceVO());
+        dnp3Mock(dataSource);
+        return dataSource;
+    }
+
+    public static Dnp3DataSource createDnp3Serial() {
+        Dnp3DataSource dataSource = new Dnp3SerialDataSource(new Dnp3SerialDataSourceVO());
+        dnp3Mock(dataSource);
+        return dataSource;
+    }
+
+    public static BACnetIPDataSourceRT createBacNet() {
+        BACnetIPDataSourceRT dataSource = new BACnetIPDataSourceRT(new BACnetIPDataSourceVO());
+        bacNetMock(dataSource);
+        return dataSource;
+    }
+
+    public static PachubeDataSourceRT createPachube() {
+        PachubeDataSourceRT dataSource = new PachubeDataSourceRT(new PachubeDataSourceVO());
+        pachubeMock(dataSource);
+        return dataSource;
+    }
+
+    public static ASCIISerialDataSource createAsciiSerial() {
+        ASCIISerialDataSource dataSource = new ASCIISerialDataSource(new ASCIISerialDataSourceVO<>());
+        asciiSerialMock(dataSource);
+        return dataSource;
+    }
+
+    public static RadiuinoEventDataSource createRadiuino() {
+        RadiuinoEventDataSource dataSource = new RadiuinoEventDataSource(new RadiuinoDataSourceVO<>());
+        radiuinoMock(dataSource);
+        return dataSource;
+    }
+
+    public static RadiuinoPollingDataSource createRadiuinoPolling() {
+        RadiuinoPollingDataSource dataSource = new RadiuinoPollingDataSource(new RadiuinoDataSourceVO<>());
+        radiuinoPollingMock(dataSource);
+        return dataSource;
+    }
+
+    public static DrStorageHt5bDataSource createDrStorageMock() {
+        DrStorageHt5bDataSource dataSource = new DrStorageHt5bDataSource(new DrStorageHt5bDataSourceVO<>());
+        drStorageMock(dataSource);
+        return dataSource;
+    }
+
+    public static MessagingDataSourceRT createAmqp() {
+        AmqpDataSourceVO amqpDataSourceVO = new AmqpDataSourceVO();
+        MessagingService messagingService = mock(MessagingService.class);
+        return new MessagingDataSourceRT(amqpDataSourceVO, messagingService);
+    }
+
+    public static MessagingDataSourceRT createMqtt() {
+        MqttDataSourceVO mqttDataSourceVO = new MqttDataSourceVO();
+        MessagingService messagingService = MessagingServiceFactory.newService(mqttDataSourceVO);
+        return new MessagingDataSourceRT(mqttDataSourceVO, messagingService);
+    }
+
+    public static SnmpDataSourceRT createSnmp() {
+        SnmpDataSourceVO snmpDataSourceVO = new SnmpDataSourceVO();
+        snmpDataSourceVO.setSnmpVersion(SnmpConstants.version1);
+        snmpDataSourceVO.setCommunity("comm");
+        SnmpDataSourceRT dataSource = new SnmpDataSourceRT(snmpDataSourceVO);
+        return dataSource;
+    }
+
+    public static GalilDataSourceRT createGalil() {
+        GalilDataSourceVO galilDataSourceVO = new GalilDataSourceVO();
+        galilDataSourceVO.setHost("localhost");
+        galilDataSourceVO.setTimeout(1);
+        galilDataSourceVO.setPort(1111);
+        GalilDataSourceRT dataSource = new GalilDataSourceRT(galilDataSourceVO);
+        galilMock(dataSource);
+        return dataSource;
+    }
+
+    public static <T> Consumer<T> consumer(Consumer<T> consumer) {
+        return consumer;
+    }
+
+    public static <T> Supplier<T> supplier(Supplier<T> function) {
+        return function;
+    }
+
+    public static <T extends DataSourceVO<T>> Function<T, DataPointVO> function(Function<T, DataPointVO> function) {
+        return function;
+    }
+
+    public static void resetUnreliable(List<DataPointRT> list1, List<DataPointRT> list2, List<DataPointRT> list3) {
+        resetUnreliableDataPoints(list1);
+        resetUnreliableDataPoints(list2);
+        resetUnreliableDataPoints(list3);
+    }
+
+    public static void setUnreliable(List<DataPointRT> list1, List<DataPointRT> list2, List<DataPointRT> list3) {
+        setUnreliableDataPoints(list1);
+        setUnreliableDataPoints(list2);
+        setUnreliableDataPoints(list3);
+    }
+
+    public static void sqlMock(SqlDataSourceRT dataSource) {
+        mockStatic(SqlDataSourceUtils.class);
+        JdbcOperations jdbcOperations = mock(JdbcOperations.class);
+        when(jdbcOperations.queryForObject(anyString(), eq(int.class))).thenReturn(1);
+        try {
+            when(SqlDataSourceUtils.createJdbcOperations(any()))
+                    .thenReturn(jdbcOperations);
+        } catch (NamingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void oneWireMock(OneWireDataSourceRT dataSource) {
+        Network networkMock = mock(Network.class);
+        try {
+            whenNew(Network.class).withAnyArguments()
+                    .thenReturn(networkMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void opcMock(OPCDataSource dataSource) {
+        RealOPCMaster realOPCMasterMock = mock(RealOPCMaster.class);
+        try {
+            whenNew(RealOPCMaster.class).withAnyArguments()
+                    .thenReturn(realOPCMasterMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void modbusMock(ModbusDataSource dataSource) {
+        AsciiMaster asciiMasterMock = mock(AsciiMaster.class);
+        TcpMaster tcpMasterMock = mock(TcpMaster.class);
+        RtuMaster rtuMasterMock = mock(RtuMaster.class);
+        try {
+            whenNew(AsciiMaster.class).withAnyArguments()
+                    .thenReturn(asciiMasterMock);
+            whenNew(TcpMaster.class).withAnyArguments()
+                    .thenReturn(tcpMasterMock);
+            whenNew(RtuMaster.class).withAnyArguments()
+                    .thenReturn(rtuMasterMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void iec101Mock(IEC101DataSource dataSource) {
+        IEC101Master iec101MasterMock = mock(IEC101Master.class);
+        try {
+            whenNew(IEC101Master.class).withAnyArguments()
+                    .thenReturn(iec101MasterMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void galilMock(GalilDataSourceRT dataSource) {
+        InputStream inputStreamMock = mock(InputStream.class);
+        OutputStream outputStreamMock = mock(OutputStream.class);
+
+        Socket socketMock = mock(Socket.class);
+
+        MessageControl messageControlMock = mock(MessageControl.class);
+        try {
+            when(messageControlMock.send(any(GalilRequest.class)))
+                    .thenReturn(new GalilResponse(new byte[]{}));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        StreamTransport streamTransportMock = mock(StreamTransport.class);
+        doAnswer(a -> {
+            return null;
+        }).when(streamTransportMock).start(anyString());
+
+        try {
+            doAnswer(a -> {
+                return null;
+            }).when(socketMock).connect(any());
+
+            when(socketMock.getInputStream()).thenReturn(inputStreamMock);
+            when(socketMock.getOutputStream()).thenReturn(outputStreamMock);
+
+            whenNew(Socket.class).withAnyArguments()
+                    .thenReturn(socketMock);
+
+            whenNew(MessageControl.class).withAnyArguments()
+                    .thenReturn(messageControlMock);
+
+            whenNew(StreamTransport.class).withAnyArguments()
+                    .thenReturn(streamTransportMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void viconicsMock(ViconicsDataSourceRT dataSource) {
+        ViconicsNetwork viconicsNetworkMock = mock(ViconicsNetwork.class);
+        try {
+            whenNew(ViconicsNetwork.class).withAnyArguments()
+                    .thenReturn(viconicsNetworkMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void nmeaMock(NmeaDataSourceRT dataSource) {
+        NmeaReceiver nmeaReceiverMock = mock(NmeaReceiver.class);
+        TimeoutTask timeoutTaskMock = mock(TimeoutTask.class);
+        try {
+            whenNew(NmeaReceiver.class).withAnyArguments()
+                    .thenReturn(nmeaReceiverMock);
+            whenNew(TimeoutTask.class).withAnyArguments()
+                    .thenReturn(timeoutTaskMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void ebi25Mock(EBI25DataSourceRT dataSource) {
+        ModbusMaster modbusMasterMock = mock(ModbusMaster.class);
+        mockStatic(EBI25Constants.class);
+        try {
+            when(EBI25Constants.initModbusMaster(anyString(), anyInt(), anyBoolean(), anyInt(), anyInt(), any()))
+                    .thenReturn(modbusMasterMock);
+        } catch (ModbusInitException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void alpha2Mock(Alpha2DataSource dataSource) {
+        Alpha2Master alpha2MasterMock = mock(Alpha2Master.class);
+        try {
+            doAnswer(invocation -> {
+                return null;
+            }).when(alpha2MasterMock).init();
+            whenNew(Alpha2Master.class)
+                    .withAnyArguments()
+                    .thenReturn(alpha2MasterMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void dnp3Mock(Dnp3DataSource dataSource) {
+        DNP3Master dnp3MasterMock = mock(DNP3Master.class);
+        try {
+            whenNew(DNP3Master.class)
+                    .withAnyArguments()
+                    .thenReturn(dnp3MasterMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void bacNetMock(BACnetIPDataSourceRT dataSource) {
+        LocalDevice localDeviceMock = mock(LocalDevice.class);
+
+        DeviceEventHandler deviceEventHandlerMock = mock(DeviceEventHandler.class);
+        when(localDeviceMock.getEventHandler()).thenReturn(deviceEventHandlerMock);
+        when(localDeviceMock.isInitialized()).thenReturn(true);
+
+        try {
+            whenNew(LocalDevice.class)
+                    .withAnyArguments()
+                    .thenReturn(localDeviceMock);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void pachubeMock(PachubeDataSourceRT dataSource) {
+        HttpClient httpClient = mock(HttpClient.class);
+        when(httpClient.getParams()).thenReturn(new HttpClientParams());
+        mockStatic(Common.class);
+        when(Common.getHttpClient(anyInt())).thenReturn(httpClient);
+    }
+
+    public static void asciiSerialMock(ASCIISerialDataSource dataSource) {
+        SerialPort serialPortMock = mock(SerialPort.class);
+        dataSource.setsPort(serialPortMock);
+    }
+
+    public static void radiuinoMock(RadiuinoEventDataSource dataSource) {
+        SerialPort serialPortMock = mock(SerialPort.class);
+        dataSource.setsPort(serialPortMock);
+    }
+
+    public static void radiuinoPollingMock(RadiuinoPollingDataSource dataSource) {
+        SerialPort serialPortMock = mock(SerialPort.class);
+        dataSource.setsPort(serialPortMock);
+    }
+
+    public static void drStorageMock(DrStorageHt5bDataSource dataSource) {
+        SerialPort serialPortMock = mock(SerialPort.class);
+        dataSource.setsPort(serialPortMock);
+        InputStream inputStreamMock = mock(InputStream.class);
+        try {
+            when(inputStreamMock.available()).thenReturn(1);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        dataSource.setInSerialStream(inputStreamMock);
+        dataSource.setsPort(serialPortMock);
+    }
+}
diff --git a/test/com/serotonin/mango/vo/LoggedUsersMultiThreadTest.java b/test/com/serotonin/mango/vo/LoggedUsersMultiThreadTest.java
index 9699286d63..b4fd5fe046 100644
--- a/test/com/serotonin/mango/vo/LoggedUsersMultiThreadTest.java
+++ b/test/com/serotonin/mango/vo/LoggedUsersMultiThreadTest.java
@@ -1,7 +1,6 @@
 package com.serotonin.mango.vo;
 
-import br.org.scadabr.db.utils.TestUtils;
-import org.junit.After;
+import utils.TestUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/test/com/serotonin/mango/vo/LoggedUsersTest.java b/test/com/serotonin/mango/vo/LoggedUsersTest.java
index b44bc49113..9606708858 100644
--- a/test/com/serotonin/mango/vo/LoggedUsersTest.java
+++ b/test/com/serotonin/mango/vo/LoggedUsersTest.java
@@ -1,7 +1,6 @@
 package com.serotonin.mango.vo;
 
-import br.org.scadabr.db.utils.TestUtils;
-import org.junit.After;
+import utils.TestUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,7 +12,6 @@
 import org.scada_lts.login.LoggedUsers;
 import org.scada_lts.web.beans.ApplicationBeans;
 import org.springframework.mock.web.MockHttpSession;
-import utils.TestConcurrentUtils;
 
 import javax.servlet.http.HttpSession;
 import java.util.*;
diff --git a/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsAppCaseTest.java b/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsAppCaseTest.java
index 4f9a1ce748..8cd78c5f16 100644
--- a/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsAppCaseTest.java
+++ b/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsAppCaseTest.java
@@ -3,13 +3,17 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.utils.SystemSettingsUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static br.org.scadabr.db.utils.TestUtils.*;
+import static utils.TestUtils.*;
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @RunWith(Parameterized.class)
 public class CalculateLinesImageChartUtilsAppCaseTest {
@@ -22,7 +26,7 @@ public static Object[][] data() {
         withNulls.add(null);
 
         int lineLengthInLegendLimit = ReportChartCreator.getLineLengthInLegendLimit();
-        int dataPointExtendedNameLengthLimit = ReportChartCreator.getDataPointExtendedNameLengthLimit();
+        int dataPointExtendedNameLengthLimit = SystemSettingsUtils.getDataPointExtendedNameLengthInReportsLimit();
 
         return new Object[][] {
 
@@ -84,10 +88,12 @@ public static Object[][] data() {
     private final int dataPointExtendedNameLengthLimit;
 
     public CalculateLinesImageChartUtilsAppCaseTest(List<String> pointStatisticsNames, int lineLengthInLegendLimit, int dataPointExtendedNameLengthLimit, int expectedLinesNumber) {
+        SystemSettingsService systemSettingsServiceMock = mock(SystemSettingsService.class);
+        when(systemSettingsServiceMock.getDataPointExtendedNameLengthInReportsLimit()).thenReturn(64);
         this.pointStatisticsNames = pointStatisticsNames.stream().map(a -> {
             if(a == null)
                 return null;
-            return ImageChartUtils.calculatePointNameForReport(a);
+            return ImageChartUtils.truncatePointNameForReport(a, systemSettingsServiceMock);
         }).collect(Collectors.toList());
         this.expectedLinesNumber = expectedLinesNumber;
         this.lineLengthInLegendLimit = lineLengthInLegendLimit;
diff --git a/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsExceptionTest.java b/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsExceptionTest.java
index fbf0525654..0656237a76 100644
--- a/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsExceptionTest.java
+++ b/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsExceptionTest.java
@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import static br.org.scadabr.db.utils.TestUtils.*;
+import static utils.TestUtils.*;
 
 @RunWith(Parameterized.class)
 public class CalculateLinesImageChartUtilsExceptionTest {
diff --git a/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsLogicCaseTest.java b/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsLogicCaseTest.java
index d68052ff33..120ae4bf05 100644
--- a/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsLogicCaseTest.java
+++ b/test/com/serotonin/mango/vo/report/CalculateLinesImageChartUtilsLogicCaseTest.java
@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static br.org.scadabr.db.utils.TestUtils.*;
+import static utils.TestUtils.*;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(Parameterized.class)
diff --git a/test/com/serotonin/mango/web/dwr/MiscDwrDoLongPollAlarmsMultiThreadTest.java b/test/com/serotonin/mango/web/dwr/MiscDwrDoLongPollAlarmsMultiThreadTest.java
index 914007594f..09708facd9 100644
--- a/test/com/serotonin/mango/web/dwr/MiscDwrDoLongPollAlarmsMultiThreadTest.java
+++ b/test/com/serotonin/mango/web/dwr/MiscDwrDoLongPollAlarmsMultiThreadTest.java
@@ -5,7 +5,6 @@
 import com.serotonin.mango.rt.event.EventInstance;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.web.dwr.longPoll.LongPollRequest;
-import com.serotonin.web.content.ContentGenerator;
 import org.directwebremoting.WebContext;
 import org.directwebremoting.WebContextFactory;
 import org.junit.Before;
@@ -16,6 +15,7 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.scada_lts.dao.SystemSettingsDAO;
 import org.scada_lts.mango.service.EventService;
+import org.scada_lts.web.content.SnippetContentGenerator;
 import org.springframework.mock.web.MockHttpSession;
 import utils.TestConcurrentUtils;
 import utils.mock.EventServiceMock;
@@ -35,7 +35,7 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({WebContextFactory.class, Common.class, MiscDwr.class, SystemSettingsDAO.class,
-        ContentGenerator.class})
+        SnippetContentGenerator.class})
 @PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*",
         "javax.activation.*", "javax.management.*"})
 public class MiscDwrDoLongPollAlarmsMultiThreadTest {
@@ -56,8 +56,8 @@ public void config() throws Exception {
         user.setId(534);
         user.setUsername(userName);
 
-        mockStatic(ContentGenerator.class);
-        when(ContentGenerator.generateContent(any(HttpServletRequest.class), anyString(), anyMap())).thenAnswer(a -> {
+        mockStatic(SnippetContentGenerator.class);
+        when(SnippetContentGenerator.generateContent(any(HttpServletRequest.class), anyString(), anyMap())).thenAnswer(a -> {
             Map<String, Object> params = (Map<String, Object>) a.getArguments()[2];
             List<EventInstance> eventInstance = (List<EventInstance>)params.get("events");
             return eventInstance.stream()
diff --git a/test/com/serotonin/mango/web/dwr/MiscDwrDoLongPollMultiThreadTest.java b/test/com/serotonin/mango/web/dwr/MiscDwrDoLongPollMultiThreadTest.java
index e5fec158f0..10d7d860b8 100644
--- a/test/com/serotonin/mango/web/dwr/MiscDwrDoLongPollMultiThreadTest.java
+++ b/test/com/serotonin/mango/web/dwr/MiscDwrDoLongPollMultiThreadTest.java
@@ -17,7 +17,6 @@
 import com.serotonin.mango.vo.dataSource.virtual.VirtualPointLocatorVO;
 import com.serotonin.mango.vo.permission.DataPointAccess;
 import com.serotonin.mango.web.dwr.longPoll.LongPollRequest;
-import com.serotonin.web.content.ContentGenerator;
 import org.directwebremoting.WebContext;
 import org.directwebremoting.WebContextFactory;
 import org.junit.Before;
@@ -31,6 +30,7 @@
 import org.scada_lts.dao.SystemSettingsDAO;
 import org.scada_lts.mango.service.EventService;
 import org.scada_lts.mango.service.ViewService;
+import org.scada_lts.web.content.SnippetContentGenerator;
 import org.springframework.mock.web.MockHttpSession;
 import utils.*;
 import utils.mock.ChangePointValueDataPointRtMock;
@@ -54,7 +54,7 @@
 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(Parameterized.class)
 @PrepareForTest({WebContextFactory.class, Common.class, MiscDwr.class, SystemSettingsDAO.class,
-        ContentGenerator.class, DataPointRT.class, DataPointDetailsDwr.class})
+        SnippetContentGenerator.class, DataPointRT.class, DataPointDetailsDwr.class})
 @PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*",
         "javax.activation.*", "javax.management.*"})
 public class MiscDwrDoLongPollMultiThreadTest {
@@ -181,8 +181,8 @@ public void config() throws Exception {
                 .withAnyArguments()
                 .thenReturn(viewDwr);
 
-        mockStatic(ContentGenerator.class);
-        when(ContentGenerator.generateContent(any(HttpServletRequest.class), anyString(), anyMap())).thenAnswer(a -> {
+        mockStatic(SnippetContentGenerator.class);
+        when(SnippetContentGenerator.generateContent(any(HttpServletRequest.class), anyString(), anyMap())).thenAnswer(a -> {
             Map<String, Object> params = (Map<String, Object>) a.getArguments()[2];
             PointValueTime pointValueTime = (PointValueTime) params.get("pointValue");
             return pointValueTime.toString();
diff --git a/test/env.properties b/test/env.properties
index 6239588d4d..aca306c256 100644
--- a/test/env.properties
+++ b/test/env.properties
@@ -107,7 +107,9 @@ svg.validator.schemas=svg/svg11-flat-20110816/svg11-flat-20110816.xsd;svg/svg10-
 # Incompatible with SVG 1.0/1.1/1.1 Second Edition/1.1 Tiny/1.1 Basic - often found in files;
 # rdf:RDF - https://www.w3.org/TR/SVGTiny12/metadata.html
 svg.validator.tags.ignore=rdf:RDF;sodipodi:namedview;inkscape:perspective
-svg.validator.messages.ignore=must appear on element;Attribute 'blend' is not allowed to appear in element 'feBlend'.;sodipodi:;inkscape:;Attribute 'vector-effect' is not allowed to appear in element 'g'.
+svg.validator.messages.ignore=must appear on element;muss in Element;Attribute 'blend' is not allowed to appear in element 'feBlend'.;sodipodi:;inkscape:;Attribute 'vector-effect' is not allowed to appear in element 'g'.;Attribut 'vector-effect' darf nicht in Element 'g' vorkommen.;
+svg.validator.disallow-doctype-decl.enabled=false
+
 systemsettings.http.response.headers={}
 
 datapoint.runtime.value.synchronized=NONE
@@ -119,9 +121,10 @@ comm.serial.sleep=1000
 
 systemsettings.email.timeout=60000
 processing.workitems.limit=51
-processing.workitems.failed.limit=51
 processing.workitems.running.limit=51
 processing.workitems.running.repeat=51
+processing.workitems.history.limit=51
+processing.workitems.history.failed.limit=51
 processing.workitems.history.process.limit=51
 processing.workitems.history.priority.high.limit=51
 processing.workitems.history.priority.medium.limit=51
@@ -139,14 +142,14 @@ view.hideShortcutDisableFullScreen=false
 eventdetector.cache.enabled=true
 event.pending.limit=101
 event.pending.update.limit=5001
-threads.name.additional.length=5
+threads.name.additional.length=255
 workitems.reporting.enabled=false
 workitems.reporting.itemspersecond.enabled=false
 workitems.reporting.itemspersecond.limit=20000
 
 webresource.uploads.path=static/uploads
 webresource.graphics.path=static/graphics
-svg.validator.disallow-doctype-decl.enabled=false
+websocket.client.sockjs.url=../../resources/node_modules/sockjs-client/dist/sockjs.min.js
 
 thread-pool-executor.low-priority.core-pool-size=1
 thread-pool-executor.low-priority.maximum-pool-size=1
@@ -173,4 +176,30 @@ thread-pool-executor.high-priority.keep-alive-time=30
 thread-pool-executor.high-priority.blocking-queue-interface-impl=java.util.concurrent.SynchronousQueue
 thread-pool-executor.high-priority.blocking-queue-interface-impl.args=
 thread-pool-executor.high-priority.blocking-queue-interface-impl.args-types=
-thread-pool-executor.high-priority.time-unit-enum-value=SECONDS
\ No newline at end of file
+thread-pool-executor.high-priority.time-unit-enum-value=SECONDS
+
+workitems.config.BatchWriteBehind.maxRows=2000
+workitems.config.BatchWriteBehind.maxInstances=5
+workitems.config.BatchWriteBehind.spawnThreshold=10000
+
+http.protocol.reject-relative-redirect=true
+http.protocol.method.follow-redirects=false
+http.protocol.max-redirects=100
+http.protocol.allow-circular-redirects=false
+http.protocol.timeout-ms=15000
+event.assign.enabled=true
+
+scadalts.security.http.query.protect.enabled=true
+scadalts.security.http.query.limit=137
+scadalts.security.http.query.access.denied.regex=^(.*?(script>|<script|/script>|</script|javascript:|onerror|onload|onmouseover|alert\\(){1}.*?)$
+scadalts.security.http.query.access.granted.regex=^(([a-zA-Z0-9_\\-]{1,32}=[a-zA-Z0-9_\\-.,/+=\s!$*?@%]*&?)|([a-zA-Z0-9_\\-]{1,32}&?))+$
+
+systemsettings.custom.css.content=#top-description-container {\n\r\t\t\t\tdisplay: flex;\n\r\t\t\t\talign-items: flex-end;\n\r\t\t\t\tjustify-content: center;\n\r} \n\r\n\r#top-description-prefix { \n\r\t\t\t\tcolor: black !important;\n\r\t\t\t\tfont-size: 2em !important;\n\r\t\t\t\tmargin-left: 0.5em !important;\n\r\t\t\t\tmargin-right: 0.5em !important;\n\r\t\t\t\tdisplay: inline-block !important;\n\r\t\t\t\tvertical-align: bottom !important;\n\r\t\t\t\tline-height: 1 !important;\n\r} \n\r\n\r#top-description {\n\r\t\t\t\tcolor: #39B54A !important;\n\r\t\t\t\tfont-size: 2em !important;\n\r\t\t\t\tdisplay: inline-block !important;\n\r\t\t\t\tline-height: 1 !important;\n\r}
+
+scadalts.security.http.body.protect.enabled=true
+scadalts.security.http.body.access.denied.regex=^(.*?((expression\\s*\\()|url\\s*\\(\\s*['\"]?javascript:|url\\s*\\(\\s*['\"]?data:|<script[^>]*>|</script>|<img[^>]+onerror=|@import\\s+url\\s*\\(\\s*['\"]?javascript:|<img[^>]*>|<script[^>]*>|<[^>]+>onerror\\s*=|onload\\s*=|eval\\s*\\(|alert\\s*\\(|onerror\\s*=|document.location){1}.*?)$
+scadalts.security.http.body.access.granted.regex=^([\\s\\S]*)$
+
+systemsettings.reports.data-point-extended-name-length.limit=64
+#save-value-as-escaped configuration for Scada-LTS version <= v2.7.8 is true
+data-type.alphanumeric.save-value-as-escaped=false
\ No newline at end of file
diff --git a/test/messages_de.properties b/test/messages_de.properties
index a3ee01559b..0d01b46410 100644
--- a/test/messages_de.properties
+++ b/test/messages_de.properties
@@ -756,7 +756,7 @@ dsEdit.mbus.vifeLabel=Vifes
 dsEdit.mbus.vifeLabels=Vife Label
 dsEdit.mbus.vifeTypes=Vife Typen
 dsEdit.meta=Meta Datenquelle
-dsEdit.meta.delay=Berechnungsverz\u00f6gerung</br>
+dsEdit.meta.delay=Berechnungsverz\u00f6gerung
 dsEdit.meta.desc=Meta Datenquelle Konfiguration
 dsEdit.meta.event=Aktualisierungsereignis
 dsEdit.meta.event.context=\u00c4nderung der Eingangsvariablen
@@ -1160,8 +1160,8 @@ dsEdit.validate.required=Required value
 dsEdit.viconics=Viconics Wireless Thermostats
 dsEdit.viconics.channel=Channel
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.chipRevisionBr=Chip revision
+dsEdit.viconics.commAddress=Comm address
 dsEdit.viconics.convertCelsius=Convert temperatures to celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Data source is not started
@@ -1170,9 +1170,9 @@ dsEdit.viconics.deviceRemove=Device remove (s)
 dsEdit.viconics.deviceWarning=Device offline timeone (s)
 dsEdit.viconics.devices=Devices
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Channel: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.viconics.networkIdentifyFailure=Network identify failed: {0}
 dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.networkTimeout=Network offline timeout (s)
@@ -1186,9 +1186,9 @@ dsEdit.viconics.timeout=Message timeout
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Virtuelle Datenquelle
 dsEdit.virtual.attractionPoint=Datenpunkt Attraktor
 dsEdit.virtual.change=\u00c4nderung
@@ -1254,17 +1254,17 @@ dsedit.opc.tagName=Tag Tag
 emport.added=added
 emport.causedBy=caused by:
 emport.compoundEvent.prefix=Compound event detector ''{0}'': {1}
-emport.compoundEvent.xid=A compound event detector does not have an 'xid' value. Ignored.
+emport.compoundEvent.xid=A compound event detector does not have an ’xid’ value. Ignored.
 emport.confirmImport=Warn: the current database will be erased! Are you sure you want to import a new project?
 emport.data=Daten
 emport.dataPoint.badReference=Data point with XID ''{0}'' does not already exist and references a data source that does not exist. Ignored.
 emport.dataPoint.prefix=Data point ''{0}'': {1}
-emport.dataPoint.xid=A data point with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.dataPoint.xid=A data point with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.dataPoints=Datenpunkte
-emport.dataSource.invalidType=Data source with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
-emport.dataSource.missingType=Data source with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.dataSource.invalidType=Data source with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
+emport.dataSource.missingType=Data source with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.dataSource.prefix=Datenquelle ''{0}'' : {1}
-emport.dataSource.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.dataSource.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.error.alarmLevel=Invalid alarm level ''{0}'' for event ''{1}''. Valid values are {2}
 emport.error.attractor.missingPoint=Data point with ''{0}'' XID ''{1}'' not found
 emport.error.chart.invalid=Chart renderer has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
@@ -1272,7 +1272,7 @@ emport.error.chart.missing=Chart renderer must have a ''{0}''. Valid values are
 emport.error.component.imageChart.invalid=Image chart component has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
 emport.error.component.imageChart.missing=Image chart component must have a ''{0}''. Valid values are {1}
 emport.error.component.imageIndex=Image index {0} is too high for image set ''{1}''. Valid values are 0 to {2}
-emport.error.component.incompatibleDataType=Data point with 'XID' ''{0}'' has a data type that is not compatible with view component type ''{1}''
+emport.error.component.incompatibleDataType=Data point with ’XID’ ''{0}'' has a data type that is not compatible with view component type ''{1}''
 emport.error.component.invalid=View component has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
 emport.error.component.missing=View component must have a ''{0}''. Valid values are {1}
 emport.error.component.unknownDynamicImage=Dynamic image id ''{0}'' not found. Known dynamic image ids are {1}
@@ -1311,7 +1311,7 @@ emport.error.text.missing=Text renderer must have a ''{0}''. Valid values are {1
 emport.error.viewShare.missing=Missing ''{0}'' in view share
 emport.errorMessage=Errors:
 emport.eventHandler.prefix=Point link ''{0}'': {1}
-emport.eventHandler.xid=A point link does not have an 'xid' value. Ignored.
+emport.eventHandler.xid=A point link does not have an ’xid’ value. Ignored.
 emport.export=Export
 emport.exportDate=Export date
 emport.exportJson=Generate JSON
@@ -1334,29 +1334,29 @@ emport.importProjectTitle=Import Project (Upload)
 emport.includePointValues=Include point values
 emport.indent=Einr\u00fcckung
 emport.invalidFile=File reading failed ({0})
-emport.invalidImportData=Zu importierende Daten sind ung\u00fctig: kein <a href="www.json.org">JSON</a> object.
+emport.invalidImportData=Zu importierende Daten sind ung\u00fctig: kein JSON object. (www.json.org)
 emport.invalidProjectName=Invalid name
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
-emport.mailingList.xid=A mailing list does not have an 'xid' value. Ignored.
+emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
 emport.maintenanceEvent.prefix=Maintenance event ''{0}'': {1}
-emport.maintenanceEvent.xid=A maintenance event does not have an 'xid' value. Ignored.
+emport.maintenanceEvent.xid=A maintenance event does not have an ’xid’ value. Ignored.
 emport.noMessages=No result message. Nothing to import?
 emport.parseError=JSON-Parser Fehler: {0}
 emport.pointHierarchy.prefix=Datenpunkthierarchie: {0}
 emport.pointLink.prefix=Point link ''{0}'': {1}
-emport.pointLink.xid=A point link does not have an 'xid' value. Ignored.
+emport.pointLink.xid=A point link does not have an ’xid’ value. Ignored.
 emport.pointValue.missingPoint=Point value ''{0}'': Data point not found
 emport.pointValues=Point values
 emport.pointValuesMax= Max point values
 emport.projectDescription=Description
 emport.projectName=Project name
-emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
-emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
+emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.publisher.prefix=Publisher ''{0}'': {1}
-emport.publisher.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.publisher.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.saved=gespeichert
 emport.scheduledEvent.prefix=Scheduled event ''{0}'': {1}
-emport.scheduledEvent.xid=A scheduled event does not have an 'xid' value. Ignored.
+emport.scheduledEvent.xid=A scheduled event does not have an ’xid’ value. Ignored.
 emport.script.prefix=Script ''{0}'': {1}
 emport.select=Markieren Sie, was Sie exportieren m\u00f6chten
 emport.selectAll=alles markieren
@@ -1367,14 +1367,14 @@ emport.unselectAll=alle Markierungen l\u00f6schen
 emport.uploadError=Upload failed ({0})
 emport.uploadsFolder=Include Uploads folder
 emport.user.prefix=Benutzer ''{0} : {1}
-emport.user.username=A user does not have a 'username' value. Ignored.
+emport.user.username=A user does not have a ’username’ value. Ignored.
 emport.userPermission.prefix=Recte f\u00fcr Benutzer ''{0}'' : {1}
-emport.versionError=The project version ({0}) isn't compatible with current system version ({1})
-emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.versionError=The project version ({0}) isn’t compatible with current system version ({1})
+emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.view.prefix=Prozessbild ''{0}'' : {1}
-emport.view.xid=A graphical view does not have an 'xid' value. Ignored.
+emport.view.xid=A graphical view does not have an ’xid’ value. Ignored.
 emport.watchList.prefix=Watch list ''{0}'': {1}
-emport.watchList.xid=A watch list does not have an 'xid' value. Ignored.
+emport.watchList.xid=A watch list does not have an ’xid’ value. Ignored.
 engUnit.0=square meters
 engUnit.1=square feet
 engUnit.10=megavolt amperes
@@ -1567,8 +1567,8 @@ engUnit.98=percent
 engUnit.99=percent per second
 engUnit.190=kilometers
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavolt amperes
 engUnit.abbr.100=per minute
 engUnit.abbr.101=per second
@@ -1789,7 +1789,7 @@ event.alarmMaxDecreased=H\u00f6chste Alarmpriorit\u00e4t verringerte sich von {0
 event.alarmMaxIncreased=H\u00f6chste Alarmpriorit\u00e4t erh\u00f6te sich von {0} auf {1}
 event.audit.added=Benutzer "{0}" erzeugte {1} mit id {2}: {3}
 event.audit.changed=Benutzer "{0}" \u00e4nderte {1} mit id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" zu "{2}"
+event.audit.changedProperty={0}: "{1}" zu "{2}"
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Datenpunkt
 event.audit.dataSource=Datenquelle
@@ -1798,7 +1798,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2053,8 +2053,8 @@ event.valueParse.generalParsePoint={0}, result={1}, point={2}
 event.valueParse.noData=No data to match against for point {0}
 event.valueParse.noTime=No time match made {0}
 event.valueParse.noValue=No value match made for point {0}
-event.valueParse.numericParse=Couldn't parse to numeric, result={0}
-event.valueParse.numericParsePoint=Couldn't parse to numeric, result={0}, point={1}
+event.valueParse.numericParse=Couldn’t parse to numeric, result={0}
+event.valueParse.numericParsePoint=Couldn’t parse to numeric, result={0}, point={1}
 event.valueParse.textParse=Value did not match any multistate text and was not parsable, result={0}
 event.valueParse.textParsePoint=Value did not match any multistate text and was not parsable, result={0}, point={1}
 event.valueParse.timeParse=Failed to parse time "{0}"
@@ -2093,7 +2093,7 @@ eventHandlers.inactiveNotif=Benachrichtigung Gegangen
 eventHandlers.inactiveOverride=Override inactive recipients
 eventHandlers.inactiveRecipients=Inactive recipients
 eventHandlers.inactiveScript=When inactive script 
-eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler's inactive list
+eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler’s inactive list
 eventHandlers.invalidActiveSource=Invalid active source point
 eventHandlers.invalidActiveSourceType=Invalid active source point data type
 eventHandlers.invalidActiveValue=Invalid active value to set
@@ -2103,14 +2103,14 @@ eventHandlers.invalidInactiveSourceType=Invalid inactive source point data type
 eventHandlers.invalidInactiveValue=Invalid inactive value to set
 eventHandlers.invalidScripts=Selecione ao menos um script
 eventHandlers.maintenanceEvents=Maintenance events
-eventHandlers.noEmailRecips=Keine Email Empf\u00e4nger!<br>Sie m\u00fcssen mindestens einen Email Empf\u00e4nger hinzuf\u00fcgen
-eventHandlers.noEscalRecips=Kein Eskalations Email Empf\u00e4nger!<br>Sie m\u00fcssen mindestens einen Eskalations Email Empf\u00e4nger hinzuf\u00fcgen
+eventHandlers.noEmailRecips=Keine Email Empf\u00e4nger! Sie m\u00fcssen mindestens einen Email Empf\u00e4nger hinzuf\u00fcgen
+eventHandlers.noEscalRecips=Kein Eskalations Email Empf\u00e4nger! Sie m\u00fcssen mindestens einen Eskalations Email Empf\u00e4nger hinzuf\u00fcgen
 eventHandlers.noInactiveRecips=You must add inactive recipients
 eventHandlers.noSetPointAction=No set point action has been defined
 eventHandlers.noTargetPoint=No target point selected. You may not have any settable points defined.
 eventHandlers.pointEventDetector=Datenpunktereignisse
 eventHandlers.publisherEvents=Ereignisse Ver\u00f6ffentlichung
-eventHandlers.recipTestEmailMessage=This message was sent as a test of an event handler's email recipient list
+eventHandlers.recipTestEmailMessage=This message was sent as a test of an event handler’s email recipient list
 eventHandlers.recipientType.active=Active
 eventHandlers.recipientType.escalation=Escalation
 eventHandlers.recipientType.inactive=Inactive
@@ -2266,7 +2266,7 @@ header.scripts=Scripting
 header.setHomeUrl=setze diese Seite als Lesezeichen
 header.sql=SQL
 header.systemSettings=Mango Einstellungen
-header.title=Mango, von Serotonin
+header.title=Scada-LTS
 header.toggleMute=Stumm schalten
 header.unmute=Unmute
 header.user=Benutzer
@@ -2294,7 +2294,7 @@ login.nag=Hinweis: Sie k\u00f6nnten Probleme mit ScadaLTS haben, da dierser Brow
 login.password=Kennwort
 login.supportedBrowser=Dieser Browser wird unterst\u00fctzt
 login.unknownBrowser=Unbekannter Browser
-login.unsupportedBrowser=Dieser Browser wird offiziell nicht von Serotonin Software unterst\u00fctzt. Wir empfehlen <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, oder  Internet Explorer 7.
+login.unsupportedBrowser=Dieser Browser wird offiziell nicht von Serotonin Software unterst\u00fctzt. Wir empfehlen Mozilla Firefox, Google Chrome.
 login.userId=Benutzername
 login.validation.accountDisabled=Ihr Account wurde gesperrt, bitte wenden Sie sich an Ihren Administrator
 login.validation.invalidLogin=Login gescheitert, bitte versuchen Sie es noch einmal
@@ -2412,7 +2412,7 @@ pointDetails.username=Benutzername
 pointDetails.views=Ansichten
 pointEdit.buttons.disable=Ausschalten
 pointEdit.buttons.enable=Einschalten
-pointEdit.buttons.note=<span class="smallTitle">Hinweis:</span> speichern, deaktivieren oder neu starten setzen alle aktiven Ereignisse zur\u00fcck.
+pointEdit.buttons.note=speichern, deaktivieren oder neu starten setzen alle aktiven Ereignisse zur\u00fcck.
 pointEdit.buttons.restart=Neustart
 pointEdit.chart.includeSum=Summe berechnen
 pointEdit.chart.invalidLimit=Tabelle: Anzahl muss zwischen 2 und 50 liegen
@@ -2561,7 +2561,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.movedElement=Moved element
 
@@ -2722,7 +2722,7 @@ reports.pointComments=Point comments
 reports.pointComments.empty=No point comments to list
 reports.pointName=Name
 reports.previous=Vorherige(r)
-reports.recipTestEmailMessage=This message was sent as a test of a report's email recipient list
+reports.recipTestEmailMessage=This message was sent as a test of a report’s email recipient list
 reports.relative=Relativ zur Erstellungszeit
 reports.rendered=Erstellt
 reports.report=Report
@@ -2801,7 +2801,7 @@ sql.query=SQL-Abfrage starten
 sql.rowsUpdated=Datens\u00e4tze aktualisiert
 sql.sql=SQL
 sql.update=SQL-Update ausf\u00fchren
-sql.warning=<span class="formError">Achtung:</span> Benutzen Sie die SQL Abfragen mit Vorsicht. Benutzerfehler k\u00f6nnen zu Datenverlust und/oder Fehlfunktionen des Systems f\u00fcren..
+sql.warning=Benutzen Sie die SQL Abfragen mit Vorsicht. Benutzerfehler k\u00f6nnen zu Datenverlust und/oder Fehlfunktionen des Systems f\u00fcren.
 systemSettings.auditAlarmLevels=Audit event alarm levels
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.auth=Server erfordert Legitimation
@@ -2824,8 +2824,8 @@ systemSettings.emailSettingsSaved=E-Mail Einstellungen gespeichert
 systemSettings.eventCount=Gespeicherte Ereignisse
 systemSettings.filedataSize=Datendateigr\u00f6\u00dfe
 systemSettings.files=Dateien
-systemSettings.fromAddress='Von' Adresse
-systemSettings.fromName='Von' Name
+systemSettings.fromAddress=’Von’ Adresse
+systemSettings.fromName=’Von’ Name
 systemSettings.futureDateLimit=Discard point values future dated more than
 systemSettings.groveLogging=Sende Fehler an Serotonin
 systemSettings.historyCount=Gespeicherte Zeitstempel
@@ -2994,7 +2994,7 @@ viewEdit.compound.name=Name
 viewEdit.compound.width=Breite
 viewEdit.deletePointView=Delete point component
 viewEdit.deleteStaticView=Delete static content
-viewEdit.deleteView=Remove yourself from the view's share list
+viewEdit.deleteView=Remove yourself from the view’s share list
 viewEdit.editGraphicalRenderer=Bearbeite Darstellung
 viewEdit.editPointView=Bearbeite Datenpunkt des Bausteins
 viewEdit.editStaticView=Edit static content
@@ -3065,7 +3065,7 @@ viewEdit.viewDelete=L\u00f6schen:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Gr\u00f6\u00dfe
 views.newView=Neue Prozessansicht
-views.noViews=Sie haben noch kein Prozessbild. Erstellen Sie <a href="view_edit.shtm">jetzt</a> eins.
+views.noViews=Sie haben noch kein Prozessbild. Erstellen Sie
 views.title=Prozessbild
 watchlist.addNewList=Neue Beobachtungsliste
 watchlist.addToWatchlist=Zur Beobachtungsliste hinzuf\u00fcgen
@@ -3323,16 +3323,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=Hinweis:
+sql.warning.prefix=Achtung:
+views.noViews.prefix=jetzt.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign Enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee Column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_en.properties b/test/messages_en.properties
index b30109299b..63689c5ba2 100644
--- a/test/messages_en.properties
+++ b/test/messages_en.properties
@@ -756,7 +756,7 @@ dsEdit.mbus.vifeLabel=Vifes
 dsEdit.mbus.vifeLabels=Vife labels
 dsEdit.mbus.vifeTypes=Vife types
 dsEdit.meta=Meta Data Source
-dsEdit.meta.delay=Execution delay<br/>
+dsEdit.meta.delay=Execution delay
 dsEdit.meta.desc=Meta data source properties
 dsEdit.meta.event=Update event
 dsEdit.meta.event.context=Context update
@@ -1160,8 +1160,8 @@ dsEdit.validate.required=Required value
 dsEdit.viconics=Viconics Wireless Thermostats
 dsEdit.viconics.channel=Channel
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.chipRevisionBr=Chip revision
+dsEdit.viconics.commAddress=Comm address
 dsEdit.viconics.convertCelsius=Convert temperatures to celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Data source is not started
@@ -1170,9 +1170,9 @@ dsEdit.viconics.deviceRemove=Device remove (s)
 dsEdit.viconics.deviceWarning=Device offline timeone (s)
 dsEdit.viconics.devices=Devices
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Channel: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.viconics.networkIdentifyFailure=Network identify failed: {0}
 dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.networkTimeout=Network offline timeout (s)
@@ -1186,9 +1186,9 @@ dsEdit.viconics.timeout=Message timeout
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Virtual Data Source
 dsEdit.virtual.attractionPoint=Attraction point
 dsEdit.virtual.change=Change
@@ -1254,17 +1254,17 @@ dsedit.opc.tagName=Tag Tag
 emport.added=added
 emport.causedBy=caused by:
 emport.compoundEvent.prefix=Compound event detector ''{0}'': {1}
-emport.compoundEvent.xid=A compound event detector does not have an 'xid' value. Ignored.
+emport.compoundEvent.xid=A compound event detector does not have an ’xid’ value. Ignored.
 emport.confirmImport=Warn: the current database will be erased! Are you sure you want to import a new project?
 emport.data=Data
 emport.dataPoint.badReference=Data point with XID ''{0}'' does not already exist and references a data source that does not exist. Ignored.
 emport.dataPoint.prefix=Data point ''{0}'': {1}
-emport.dataPoint.xid=A data point with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.dataPoint.xid=A data point with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.dataPoints=Data points
-emport.dataSource.invalidType=Data source with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
-emport.dataSource.missingType=Data source with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.dataSource.invalidType=Data source with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
+emport.dataSource.missingType=Data source with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.dataSource.prefix=Data source ''{0}'': {1}
-emport.dataSource.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.dataSource.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.error.alarmLevel=Invalid alarm level ''{0}'' for event ''{1}''. Valid values are {2}
 emport.error.attractor.missingPoint=Data point with ''{0}'' XID ''{1}'' not found
 emport.error.chart.invalid=Chart renderer has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
@@ -1272,7 +1272,7 @@ emport.error.chart.missing=Chart renderer must have a ''{0}''. Valid values are
 emport.error.component.imageChart.invalid=Image chart component has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
 emport.error.component.imageChart.missing=Image chart component must have a ''{0}''. Valid values are {1}
 emport.error.component.imageIndex=Image index {0} is too high for image set ''{1}''. Valid values are 0 to {2}
-emport.error.component.incompatibleDataType=Data point with 'XID' ''{0}'' has a data type that is not compatible with view component type ''{1}''
+emport.error.component.incompatibleDataType=Data point with ’XID’ ''{0}'' has a data type that is not compatible with view component type ''{1}''
 emport.error.component.invalid=View component has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
 emport.error.component.missing=View component must have a ''{0}''. Valid values are {1}
 emport.error.component.unknownDynamicImage=Dynamic image id ''{0}'' not found. Known dynamic image ids are {1}
@@ -1311,7 +1311,7 @@ emport.error.text.missing=Text renderer must have a ''{0}''. Valid values are {1
 emport.error.viewShare.missing=Missing ''{0}'' in view share
 emport.errorMessage=Errors:
 emport.eventHandler.prefix=Point link ''{0}'': {1}
-emport.eventHandler.xid=A point link does not have an 'xid' value. Ignored.
+emport.eventHandler.xid=A point link does not have an ’xid’ value. Ignored.
 emport.export=Export
 emport.exportDate=Export date
 emport.exportJson=Generate JSON
@@ -1334,29 +1334,29 @@ emport.importProjectTitle=Import Project (Upload)
 emport.includePointValues=Include point values
 emport.indent=Indent level
 emport.invalidFile=File reading failed ({0})
-emport.invalidImportData=Import data is invalid: not a JSON object
+emport.invalidImportData=Import data is invalid: not a JSON object. (www.json.org)
 emport.invalidProjectName=Invalid name
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
-emport.mailingList.xid=A mailing list does not have an 'xid' value. Ignored.
+emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
 emport.maintenanceEvent.prefix=Maintenance event ''{0}'': {1}
-emport.maintenanceEvent.xid=A maintenance event does not have an 'xid' value. Ignored.
+emport.maintenanceEvent.xid=A maintenance event does not have an ’xid’ value. Ignored.
 emport.noMessages=No result message. Nothing to import?
 emport.parseError=JSON parse error: {0}
 emport.pointHierarchy.prefix=Point hierarchy: {0}
 emport.pointLink.prefix=Point link ''{0}'': {1}
-emport.pointLink.xid=A point link does not have an 'xid' value. Ignored.
+emport.pointLink.xid=A point link does not have an ’xid’ value. Ignored.
 emport.pointValue.missingPoint=Point value ''{0}'': Data point not found
 emport.pointValues=Point values
 emport.pointValuesMax= Max point values
 emport.projectDescription=Description
 emport.projectName=Project name
-emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
-emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
+emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.publisher.prefix=Publisher ''{0}'': {1}
-emport.publisher.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.publisher.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.saved=saved
 emport.scheduledEvent.prefix=Scheduled event ''{0}'': {1}
-emport.scheduledEvent.xid=A scheduled event does not have an 'xid' value. Ignored.
+emport.scheduledEvent.xid=A scheduled event does not have an ’xid’ value. Ignored.
 emport.script.prefix=Script ''{0}'': {1}
 emport.select=Select what you would like to export
 emport.selectAll=Select all
@@ -1367,14 +1367,14 @@ emport.unselectAll=Unselect all
 emport.uploadError=Upload failed ({0})
 emport.uploadsFolder=Include Uploads folder
 emport.user.prefix=User ''{0}'': {1}
-emport.user.username=A user does not have a 'username' value. Ignored.
+emport.user.username=A user does not have a ’username’ value. Ignored.
 emport.userPermission.prefix=Permissions for user ''{0}'': {1}
-emport.versionError=The project version ({0}) isn't compatible with current system version ({1})
-emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.versionError=The project version ({0}) isn’t compatible with current system version ({1})
+emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.view.prefix=View ''{0}'': {1}
-emport.view.xid=A graphical view does not have an 'xid' value. Ignored.
+emport.view.xid=A graphical view does not have an ’xid’ value. Ignored.
 emport.watchList.prefix=Watch list ''{0}'': {1}
-emport.watchList.xid=A watch list does not have an 'xid' value. Ignored.
+emport.watchList.xid=A watch list does not have an ’xid’ value. Ignored.
 engUnit.0=square meters
 engUnit.1=square feet
 engUnit.10=megavolt amperes
@@ -1567,8 +1567,8 @@ engUnit.98=percent
 engUnit.99=percent per second
 engUnit.190=kilometers
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavolt amperes
 engUnit.abbr.100=per minute
 engUnit.abbr.101=per second
@@ -1789,7 +1789,7 @@ event.alarmMaxDecreased=Maximum alarm level has decreased from {0} to {1}
 event.alarmMaxIncreased=Maximum alarm level has increased from {0} to {1}
 event.audit.added=User "{0}" created {1} with id {2}: {3}
 event.audit.changed=User "{0}" changed {1} with id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty= {0}: "{1}" to "{2}", 
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Data point
 event.audit.dataSource=Data source
@@ -1798,7 +1798,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property= {0}="{1}", 
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2053,8 +2053,8 @@ event.valueParse.generalParsePoint={0}, result={1}, point={2}
 event.valueParse.noData=No data to match against for point {0}
 event.valueParse.noTime=No time match made {0}
 event.valueParse.noValue=No value match made for point {0}
-event.valueParse.numericParse=Couldn't parse to numeric, result={0}
-event.valueParse.numericParsePoint=Couldn't parse to numeric, result={0}, point={1}
+event.valueParse.numericParse=Couldn’t parse to numeric, result={0}
+event.valueParse.numericParsePoint=Couldn’t parse to numeric, result={0}, point={1}
 event.valueParse.textParse=Value did not match any multistate text and was not parsable, result={0}
 event.valueParse.textParsePoint=Value did not match any multistate text and was not parsable, result={0}, point={1}
 event.valueParse.timeParse=Failed to parse time "{0}"
@@ -2084,7 +2084,7 @@ eventHandlers.escal=Send escalation
 eventHandlers.escalDelayError=Escalation delay must be greater than zero
 eventHandlers.escalPeriod=Escalate if active for
 eventHandlers.escalRecipients=Escalation recipients
-eventHandlers.escalTestEmailMessage=This message was sent as a test of an event handler's escalation list
+eventHandlers.escalTestEmailMessage=This message was sent as a test of an event handler’s escalation list
 eventHandlers.eventHandler=Event handler
 eventHandlers.eventHandlers=Event handlers
 eventHandlers.inactiveAction=Inactive action
@@ -2093,7 +2093,7 @@ eventHandlers.inactiveNotif=Send inactive notification
 eventHandlers.inactiveOverride=Override inactive recipients
 eventHandlers.inactiveRecipients=Inactive recipients
 eventHandlers.inactiveScript=When inactive script 
-eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler's inactive list
+eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler’s inactive list
 eventHandlers.invalidActiveSource=Invalid active source point
 eventHandlers.invalidActiveSourceType=Invalid active source point data type
 eventHandlers.invalidActiveValue=Invalid active value to set
@@ -2110,7 +2110,7 @@ eventHandlers.noSetPointAction=No set point action has been defined
 eventHandlers.noTargetPoint=No target point selected. You may not have any settable points defined.
 eventHandlers.pointEventDetector=Point event detectors
 eventHandlers.publisherEvents=Publisher events
-eventHandlers.recipTestEmailMessage=This message was sent as a test of an event handler's email recipient list
+eventHandlers.recipTestEmailMessage=This message was sent as a test of an event handler’s email recipient list
 eventHandlers.recipientType.active=Active
 eventHandlers.recipientType.escalation=Escalation
 eventHandlers.recipientType.inactive=Inactive
@@ -2295,7 +2295,7 @@ login.nag=NOTE: you may have problems with ScadaLTS because your browser is not
 login.password=Password
 login.supportedBrowser=This browser is supported.
 login.unknownBrowser=Checking your browser for compatibility...
-login.unsupportedBrowser=Your browser may work with this product, but is not officially supported by Serotonin Software. We instead recommend the use of <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, or Internet Explorer 7
+login.unsupportedBrowser=Your browser may work with this product, but is not officially supported by Serotonin Software. We instead recommend the use of Mozilla Firefox, Google Chrome.
 login.userId=User id
 login.validation.accountDisabled=Your account has been disabled. Please contact your administrator
 login.validation.invalidLogin=Invalid login, please try again
@@ -2368,7 +2368,7 @@ notes.timeByUsername=time by username
 notes.userNotes=User notes
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pagination.ascending=Ascending
 pagination.descending=Descending
 pagination.next=Next
@@ -2413,7 +2413,7 @@ pointDetails.username=Username
 pointDetails.views=Views
 pointEdit.buttons.disable=Disable
 pointEdit.buttons.enable=Enable
-pointEdit.buttons.note=<span class="smallTitle">Note:</span> saving, disabling, or restarting a point causes all active events to be returned to normal.
+pointEdit.buttons.note=saving, disabling, or restarting a point causes all active events to be returned to normal.
 pointEdit.buttons.restart=Restart
 pointEdit.chart.includeSum=Include sum
 pointEdit.chart.invalidLimit=Chart renderer: limit must be between 2 and 50
@@ -2561,7 +2561,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.areYouSureToMoveElement=Are you sure to move element?
 pointHierarchySLTS.movedElement=Moved element
@@ -2725,7 +2725,7 @@ reports.pointComments=Point comments
 reports.pointComments.empty=No point comments to list
 reports.pointName=Point name
 reports.previous=Previous
-reports.recipTestEmailMessage=This message was sent as a test of a report's email recipient list
+reports.recipTestEmailMessage=This message was sent as a test of a report’s email recipient list
 reports.relative=Relative to report time
 reports.rendered=Rendered
 reports.report=Report
@@ -2804,7 +2804,7 @@ sql.query=Submit query
 sql.rowsUpdated=records(s) updated.      
 sql.sql=SQL
 sql.update=Submit update
-sql.warning=<span class="formError">Warning:</span> use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
+sql.warning=use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
 systemSettings.auditAlarmLevels=Audit event alarm levels
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.auth=Use authorization
@@ -2827,8 +2827,8 @@ systemSettings.emailSettingsSaved=Email settings have been saved
 systemSettings.eventCount=Event count
 systemSettings.filedataSize=Filedata size
 systemSettings.files=files
-systemSettings.fromAddress='From' address
-systemSettings.fromName='From' name
+systemSettings.fromAddress=’From’ address
+systemSettings.fromName=’From’ name
 systemSettings.futureDateLimit=Discard point values future dated more than
 systemSettings.groveLogging=Send errors to Serotonin
 systemSettings.historyCount=History count
@@ -3001,7 +3001,7 @@ viewEdit.compound.name=Name
 viewEdit.compound.width=Width
 viewEdit.deletePointView=Delete point component
 viewEdit.deleteStaticView=Delete static content
-viewEdit.deleteView=Remove yourself from the view's share list
+viewEdit.deleteView=Remove yourself from the view’s share list
 viewEdit.editGraphicalRenderer=Edit graphical renderer
 viewEdit.editPointView=Edit point component settings
 viewEdit.editStaticView=Edit static content
@@ -3072,7 +3072,7 @@ viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Size
 views.newView=New view
-views.noViews=You have not created any graphical views. Create one <a href="view_edit.shtm">now</a>.
+views.noViews=You have not created any graphical views. Create one 
 views.title=Graphic views
 watchlist.addNewList=Add new watch list
 watchlist.addToWatchlist=Add to watch list
@@ -3089,7 +3089,7 @@ watchlist.imageChartButton=Get Chart
 watchlist.imageChartLiveButton=Start/Stop Live Chart
 watchlist.moveDown=Move down
 watchlist.moveUp=Move up
-watchlist.newListName=Enter the watch list's new name
+watchlist.newListName=Enter the watch list’s new name
 watchlist.noChartables=No chartable points in watch list
 watchlist.noExportables=No points selected for export
 watchlist.pointDetails=Point details
@@ -3326,16 +3326,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=Note:
+sql.warning.prefix=Warning:
+views.noViews.prefix=now.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_es.properties b/test/messages_es.properties
index d34a747fdd..7e42074984 100644
--- a/test/messages_es.properties
+++ b/test/messages_es.properties
@@ -13,7 +13,7 @@
 #  General Public License for more details.  
 #  
 #  You should have received a copy of the GNU General Public License  
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   
 #  This file incorporates work covered by the following copyright and  
 #  permission notice:
@@ -780,7 +780,7 @@ dsEdit.mbus.vifeTypes=Tipos de Vife
 dsEdit.mbus.vifLabel=Etiqueta Vif
 dsEdit.mbus.vifType=Tipo de Vif
 dsEdit.meta=Fuente de datos Meta
-dsEdit.meta.delay=Demorar la Ejecuci\u00f3n<br/>
+dsEdit.meta.delay=Demorar la Ejecuci\u00f3n
 dsEdit.meta.desc=Propiedades de fuente de datos Meta
 dsEdit.meta.event=Actualizar evento
 dsEdit.meta.event.context=Actualizar contexto
@@ -1145,8 +1145,8 @@ dsEdit.validate.required=Valor requerido
 dsEdit.viconics=Termostato inal\u00e1mbrico Viconics
 dsEdit.viconics.channel=Canal
 dsEdit.viconics.chipRevision=Revisi\u00f3n de Chip
-dsEdit.viconics.chipRevisionBr=Chip<br/>revisi\u00f3n
-dsEdit.viconics.commAddress=Comm<br/>direcci\u00f3n
+dsEdit.viconics.chipRevisionBr=Chip revisi\u00f3n
+dsEdit.viconics.commAddress=Comm direcci\u00f3n
 dsEdit.viconics.convertCelsius=Conversi\u00f3n de temperatura a Celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Fuente de datos no ha sido iniciada
@@ -1155,9 +1155,9 @@ dsEdit.viconics.deviceRemove=Eliminaci\u00f3n de dispositivo (s)
 dsEdit.viconics.devices=Dispositivos
 dsEdit.viconics.deviceWarning=Desconexi\u00f3n de Dispositivo por tiempo de espera (s)
 dsEdit.viconics.dpconn=Puerto: {0}, ID PAN: {1}, Canal: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revisi\u00f3n
+dsEdit.viconics.firmwareRevision=Firmware revisi\u00f3n
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Modelo<br/>n\u00famero
+dsEdit.viconics.modelNumber=Modelo n\u00famero
 dsEdit.viconics.networkIdentifyFailure=Fall\u00f3 identificaci\u00f3n de Red: {0}
 dsEdit.viconics.networkInfo=Informaci\u00f3n de la Red
 dsEdit.viconics.networkTimeout=Desconexi\u00f3n de Red por tiempo de espera (s)
@@ -1171,9 +1171,9 @@ dsEdit.viconics.timeout=Tiempo de espera del mensaje
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=El valor del Punto puede no ser confiable
 dsEdit.viconics.zigbeeFirmwareRevision=Revisi\u00f3n de Firmware de Zigbee
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Direcci\u00f3n de red de Zigbee
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Fuente de datos Virtual
 dsEdit.virtual.attractionPoint=Punto de atracci\u00f3n
 dsEdit.virtual.change=Cambio
@@ -1237,17 +1237,17 @@ dsList.type=Tipo
 emport.added=agregado
 emport.causedBy=causado por:
 emport.compoundEvent.prefix=Detector de evento compuesto ''{0}'': {1}
-emport.compoundEvent.xid=Un detector de evento compuesto no tiene un valor 'xid'. Ignorado.
+emport.compoundEvent.xid=Un detector de evento compuesto no tiene un valor ’xid’. Ignorado.
 emport.confirmImport=Atenci\u00f3n: todos los datos del proyecto actual ser\u00e1n eliminados! \u00bfEst\u00e1 seguro que desea importar un nuevo proyecto?
 emport.data=Dato
 emport.dataPoint.badReference=Dato del punto con XID ''{0}'' ya no existe y hace referencia a una fuente de datos que no existe. Ignorado
 emport.dataPoint.prefix=Dato del punto''{0}'': {1}
-emport.dataPoint.xid=A Dato del punto con Nombre ''{0}'' no tiene un valor 'xid'. Ignorado.
+emport.dataPoint.xid=A Dato del punto con Nombre ''{0}'' no tiene un valor ’xid’. Ignorado.
 emport.dataPoints=Datos de puntos
-emport.dataSource.invalidType= La fuente de datos con XID ''{0}'' ya no existe y tiene un valor de 'tipo' inv\u00e1lido de ''{1}''. Los tipos v\u00e1lidos son {2}
+emport.dataSource.invalidType= La fuente de datos con XID ''{0}'' ya no existe y tiene un valor de ’tipo’ inv\u00e1lido de ''{1}''. Los tipos v\u00e1lidos son {2}
 emport.dataSource.missingType=La fuente de datos con  XID ''{0}'' ya no existe y no tiene un valor de "tipo". Los tipos v\u00e1lidos son {1}
 emport.dataSource.prefix=Fuente de datos ''{0}'': {1}
-emport.dataSource.xid=LA fuente de datos de Nombre ''{0}'' no tienen un valor 'xid'. Ignorado.
+emport.dataSource.xid=LA fuente de datos de Nombre ''{0}'' no tienen un valor ’xid’. Ignorado.
 emport.error.alarmLevel=Nivel de alarma inv\u00e1lido ''{0}'' para el evento ''{1}''. Los valores v\u00e1lidos son {2}
 emport.error.attractor.missingPoint=Dato del punto con ''{0}'' XID ''{1}'' no encontrado
 emport.error.chart.invalid=El generador gr\u00e1fico tiene un  valor inv\u00e1lido de ''{0}'' de ''{1}''. Los valores v\u00e1lidos son {2}
@@ -1255,7 +1255,7 @@ emport.error.chart.missing=El generador gr\u00e1fico deber\u00eda tener un ''{0}
 emport.error.component.imageChart.invalid=El componente del Gr\u00e1fico tiene un valor inv\u00e1lido ''{0}'' de ''{1}''. Los valores v\u00e1lidos son {2}
 emport.error.component.imageChart.missing=El componente del Gr\u00e1fico deber\u00eda tener un ''{0}''. Los valores v\u00e1lidos son {1}
 emport.error.component.imageIndex=El \u00edndice de la imagen {0} es muy grande para su conjunto ''{1}''. Los valores v\u00e1lidos son 0 to {2}
-emport.error.component.incompatibleDataType=Dato del punto con 'XID' ''{0}'' tiene un tipo de dato que no es compatible con el componente de la Vista de tipo ''{1}''
+emport.error.component.incompatibleDataType=Dato del punto con ’XID’ ''{0}'' tiene un tipo de dato que no es compatible con el componente de la Vista de tipo ''{1}''
 emport.error.component.invalid=El componente de la Vista tiene un valor inv\u00e1lido ''{0}'' de ''{1}''. Los valores v\u00e1lidos son {2}
 emport.error.component.missing=El componente de la Vista deber\u00eda tener un ''{0}''. Los valores v\u00e1lidos son {1}
 emport.error.component.unknownDynamicImage=ID de Imagen din\u00e1mica ''{0}'' no encontrada. Las im\u00e1genes din\u00e1micas conocidas son {1}
@@ -1289,12 +1289,12 @@ emport.error.recipient.invalid.reference=Recipient tiene un valor inv\u00e1lido
 emport.error.recipient.missing=Recipient deber\u00eda tener un ''{0}''. Los valores v\u00e1lidos son {1}
 emport.error.recipient.missing.reference=Recipient deber\u00eda tener un ''{0}''
 emport.error.scheduledEvent.invalid=El planificador de eventos tiene un valor inv\u00e1lido ''{0}'' de ''{1}''. Los valores v\u00e1lidos son {2}
-emport.error.text.invalid=El generador de texto tiene un  valor inv\u00e1lido de ''{0}''de ''{1}''. Los valores v\u00e1lidos son {2}
+emport.error.text.invalid=El generador de texto tiene un  valor inv\u00e1lido de ''{0}'' de ''{1}''. Los valores v\u00e1lidos son {2}
 emport.error.text.missing=El generador de texto  deber\u00eda tener un ''{0}''. Los valores v\u00e1lidos son {1}
 emport.error.viewShare.missing=Perdido ''{0}'' en la vista compartida
 emport.errorMessage=Hay errores en el archivo enviado:
 emport.eventHandler.prefix=Enlace a punto ''{0}'': {1}
-emport.eventHandler.xid=Un enlace a punto no tiene un valor 'xid'. Ignorado.
+emport.eventHandler.xid=Un enlace a punto no tiene un valor ’xid’. Ignorado.
 emport.export=Exportar
 emport.exportDate=Fecha de exportaci\u00f3n
 emport.exportJson=Generar JSON
@@ -1317,29 +1317,29 @@ emport.importProjectTitle=Importar Proyecto (Upload)
 emport.includePointValues=Incluir hist\u00f3rico de puntos
 emport.indent=Nivel de identaci\u00f3n
 emport.invalidFile=Error en la lectura del archivo ({0})
-emport.invalidImportData=Dato de importaci\u00f3n inv\u00e1lido: no es un objeto JSON
+emport.invalidImportData=Dato de importaci\u00f3n inv\u00e1lido: no es un objeto JSON. (www.json.org)
 emport.invalidProjectName=Nombre inv\u00e1lido para el Proyecto
 emport.mailingList.prefix=Prefijo de la lista de correo
-emport.mailingList.xid=Una lista de correo no tiene un valor 'xid'. Ignorado.
+emport.mailingList.xid=Una lista de correo no tiene un valor ’xid’. Ignorado.
 emport.maintenanceEvent.prefix=Evento de mantenimiento ''{0}'': {1}
-emport.maintenanceEvent.xid=Un evento de mantenimiento no tienen valor 'xid'. Se ignor\u00f3.
+emport.maintenanceEvent.xid=Un evento de mantenimiento no tienen valor ’xid’. Se ignor\u00f3.
 emport.noMessages=Sin mensaje de resultado. \u00bfNada que importar?
 emport.parseError=Error de an\u00e1lisis JSON: {0}
 emport.pointHierarchy.prefix=Jerarqu\u00eda de Punto: {0}
 emport.pointLink.prefix=Punto de enlace ''{0}'': {1}
-emport.pointLink.xid=Un punto de enlace no tiene un valor 'xid'. Ignorado.
+emport.pointLink.xid=Un punto de enlace no tiene un valor ’xid’. Ignorado.
 emport.pointValue.missingPoint=Hist\u00f3rico de punto ''{0}'': Informaci\u00f3n del punto no se encuentra
 emport.pointValues=Hist\u00f3rico (valores)
 emport.pointValuesMax=M\u00e1ximo (puntos a guardar)
 emport.projectDescription=Descripci\u00f3n
 emport.projectName=Nombre del Proyecto
-emport.publisher.invalidType=Publisher with XID ''{0}'' ya no existe y tiene un inv\u00e1lido 'type' valor de ''{1}''. Los tipos v\u00e1lidos son {2}
-emport.publisher.missingType=Publicador con XID ''{0}'' ya no existe y no tiene un valor de 'type'. Los tipos v\u00e1lidos son {1}
+emport.publisher.invalidType=Publisher with XID ''{0}'' ya no existe y tiene un inv\u00e1lido ’type’ valor de ''{1}''. Los tipos v\u00e1lidos son {2}
+emport.publisher.missingType=Publicador con XID ''{0}'' ya no existe y no tiene un valor de ’type’. Los tipos v\u00e1lidos son {1}
 emport.publisher.prefix=Publicador ''{0}'': {1}
-emport.publisher.xid=La fuente de datos con el nombre ''{0}'' no tiene un valor 'xid'. Ignorado.
+emport.publisher.xid=La fuente de datos con el nombre ''{0}'' no tiene un valor ’xid’. Ignorado.
 emport.saved=guardado
 emport.scheduledEvent.prefix=El planificador de eventos ''{0}'': {1}
-emport.scheduledEvent.xid=A El planificador de eventos no tiene un valor 'xid'. Ignorado.
+emport.scheduledEvent.xid=A El planificador de eventos no tiene un valor ’xid’. Ignorado.
 emport.script.prefix=Script ''{0}'': {1}
 emport.select=Seleccione que le gustar\u00eda exportar
 emport.selectAll=Seleccione todo
@@ -1350,14 +1350,14 @@ emport.unselectAll=Desmarcar todo
 emport.uploadError=Fall\u00f3 carga (upload) de archivo ({0})
 emport.uploadsFolder=Incluir carpeta de Uploads
 emport.user.prefix=Usuario ''{0}'': {1}
-emport.user.username=Un usuario no tiene un valor de 'nombre de usuario'. Ignorado
+emport.user.username=Un usuario no tiene un valor de ’nombre de usuario’. Ignorado
 emport.userPermission.prefix=Permisos para el usuario ''{0}'': {1}
 emport.versionError=La versi\u00f3n del proyecto ({0}) es incompatible con la versi\u00f3n actual del sistema ({1})
 emport.view.missingType=Vista con XID ''{0}'' ya no existe y no tiene un valor de "tipo". Los tipos v\u00e1lidos son {1}
 emport.view.prefix=Vista ''{0}'': {1}
-emport.view.xid=Una vista gr\u00e1fica no tiene un valor 'xid'. Ignorado.
+emport.view.xid=Una vista gr\u00e1fica no tiene un valor ’xid’. Ignorado.
 emport.watchList.prefix=Lista de Supervisi\u00f3n ''{0}'': {1}
-emport.watchList.xid=Una Lista de Supervisi\u00f3n no tiene un valor de 'xid'. Se ignora.
+emport.watchList.xid=Una Lista de Supervisi\u00f3n no tiene un valor de ’xid’. Se ignora.
 engUnit.0=metros cuadrados
 engUnit.1=pies cuadrados
 engUnit.10=megavoltio amperios
@@ -1550,8 +1550,8 @@ engUnit.98=porcentaje
 engUnit.99=porcentaje por segundo
 engUnit.190=kilómetros
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavoltio amperios
 engUnit.abbr.100=por minuto
 engUnit.abbr.101=por segundo
@@ -1777,7 +1777,7 @@ event.alarmMaxDecreased=Nivel m\u00e1ximo de la alarma ha sido disminuido de {0}
 event.alarmMaxIncreased=Nivel m\u00e1ximo de la alarma ha sido incrementado de {0} a {1}
 event.audit.added=Usuario "{0}" creado {1} con id {2}: {3}
 event.audit.changed=Usuario "{0}" modificado {1} con id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" a "{2}"
+event.audit.changedProperty={0}: "{1}" a "{2}"
 event.audit.compoundEventDetector=Detector de evento compuesto
 event.audit.dataPoint=Datos de punto
 event.audit.dataSource=Fuente de Datos
@@ -1786,7 +1786,7 @@ event.audit.eventHandler=Manejador de evento
 event.audit.maintenanceEvent=Evento de Mantenimiento
 event.audit.pointEventDetector=Detector de evento de punto
 event.audit.pointLink=Enlace de Punto
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}
+event.audit.property={0}
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2278,7 +2278,7 @@ login.nag=NOTA: Puede tener problemas con ScadaLTS porque su navegador no est\u0
 login.password=Contrase\u00f1a
 login.supportedBrowser=Este navegador est\u00e1 soportado.
 login.unknownBrowser=Revisando compatibilidad del navegador...
-login.unsupportedBrowser=Su navegador puede trabajar con este producto, pero no est\u00e1 oficialmente soportado por Serotonin Software. Le recomendamos que tilice <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, o Internet Explorer 7.
+login.unsupportedBrowser=Su navegador puede trabajar con este producto, pero no est\u00e1 oficialmente soportado por Serotonin Software. Le recomendamos que tilice Mozilla Firefox, Google Chrome.
 login.userId=ID de Usuario
 login.validation.accountDisabled=Su cuenta ha sido deshabilitada. Por favor contacte al administrador
 login.validation.invalidLogin=Inicio de sesi\u00f3n Inv\u00e1lido, por favor intente de nuevo.
@@ -2351,7 +2351,7 @@ notes.timeByUsername=Hora del usuario
 notes.userNotes=Notas de Usuario
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pagination.ascending=Incrementando
 pagination.descending=Disminuyendo
 pagination.next=Pr\u00f3ximo
@@ -2396,7 +2396,7 @@ pointDetails.username=Nombre de Usuario
 pointDetails.views=Vistas
 pointEdit.buttons.disable=Deshabilitar
 pointEdit.buttons.enable=Habilitar
-pointEdit.buttons.note=<span class
+pointEdit.buttons.note=guardar, deshabilitar o reiniciar un punto hace que todos los eventos activos vuelvan a la normalidad.
 pointEdit.buttons.restart=Reiniciar
 pointEdit.chart.includeSum=Incluya suma
 pointEdit.chart.invalidLimit=Generador gr\u00e1fico: El l\u00edmite debe estar entre 2 y 50
@@ -2544,7 +2544,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.areYouSureToMoveElement=Are you sure to move element?
 pointHierarchySLTS.movedElement=Moved element
@@ -2785,7 +2785,7 @@ sql.query=Enviar consulta
 sql.rowsUpdated=Filas(s) actualizada(s).
 sql.sql=SQL
 sql.update=Enviar actualizaci\u00f3n
-sql.warning=<span class
+sql.warning=use esta instalaci\u00f3n bajo su propio riesgo. El uso incorrecto puede resultar en datos corruptos y/o fallas del sistema.
 systemSettings.auditAlarmLevels=Niveles de alarmas para eventos de auditor\u00eda 
 systemSettings.auditAlarmLevelsSaved=Los niveles de alarma de eventos auditados han sido guardados
 systemSettings.auth=Utilice autorizaci\u00f3n
@@ -2803,8 +2803,8 @@ systemSettings.emailSettingsSaved=La configuraci\u00f3n del correo ha sido guard
 systemSettings.eventCount=Contador de eventos
 systemSettings.filedataSize=Tama\u00f1o del archivo de datos
 systemSettings.files=archivos
-systemSettings.fromAddress=Direcci\u00f3n 'De'
-systemSettings.fromName=Nombre 'De'
+systemSettings.fromAddress=Direcci\u00f3n ’De’
+systemSettings.fromName=Nombre ’De’
 systemSettings.futureDateLimit=Descartar valores de puntos fechados en el futuro mayores que
 systemSettings.groveLogging=Enviar errores a Serotonin
 systemSettings.historyCount=Contador Hist\u00f3rico
@@ -3031,7 +3031,7 @@ viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Size
 views.newView=Nueva vista
-views.noViews=No se ha creado ninguna vista gr\u00e1fica. Cree una <a href="view_edit.shtm">nueva</a>.
+views.noViews=No se ha creado ninguna vista gr\u00e1fica. Cree una 
 views.title=Vistas gr\u00e1ficas
 watchlist.addNewList=Agregar nueva Lista de Supervisi\u00f3n
 watchlist.addToWatchlist=Agregar a Lista de Supervisi\u00f3n
@@ -3295,7 +3295,7 @@ graphic.enhancedImageChart.seriesConfig.seriesOptions=Options for {0}\:
 dsEdit.modbus.dpconn3=Connection monitoring
 viewEdit.compound.point.lineType.spline=Spline
 userProfiles.validate.nameUnique=Profile name must be unique and not empty
-eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler's inactive list
+eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler’s inactive list
 graphic.enhancedImageChart.pointConfig.renderMode.line=Line
 watchlist.imageChartLiveButton=Start/Stop Live Chart
 dsEdit.radiuino.radiuinoDataType.4bFloat=Float (4 bytes)
@@ -3366,16 +3366,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=Nota:
+sql.warning.prefix=Advertencia:
+views.noViews.prefix=nueva.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_fi.properties b/test/messages_fi.properties
index 812f1fe756..624726b659 100644
--- a/test/messages_fi.properties
+++ b/test/messages_fi.properties
@@ -667,7 +667,7 @@ dsEdit.meta.event.week=Viikon alku
 dsEdit.meta.event.month=Kuukauden alku
 dsEdit.meta.event.year=Vuoden alku
 dsEdit.meta.event.cron=Cron-ajastus
-dsEdit.meta.delay=Suoritusviive<br/>
+dsEdit.meta.delay=Suoritusviive
 dsEdit.meta.test.success=Onnistui. tulos={0}
 dsEdit.meta.test.successTs=Onnistui. tulos={0}, aikaleima={1}
 dsEdit.meta.test.context=Yksi tai useampi piste puuttuu tai ei ole k\u00e4yt\u00f6ss\u00e4
@@ -966,16 +966,16 @@ dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.refreshing=Refreshing...
 dsEdit.viconics.rfModule=RF Module
 dsEdit.viconics.devices=Devices
-dsEdit.viconics.commAddress=Comm<br/>address
-dsEdit.viconics.modelNumber=Model<br/>number
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.commAddress=Comm address
+dsEdit.viconics.modelNumber=Model number
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
+dsEdit.viconics.chipRevisionBr=Chip revision
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
@@ -1096,42 +1096,42 @@ emport.importProgress=Tuonti k\u00e4ynniss\u00e4...
 emport.importCancelled=Tuonti peruttu
 emport.importComplete=Tuonti valmis
 emport.noMessages=Ei tulosviesti\u00e4. Ei mit\u00e4\u00e4n tuotavaa?
-emport.invalidImportData=Tuotava tieto on virheellinen: Ei JSON-objekti
+emport.invalidImportData=Tuotava tieto on virheellinen: Ei JSON-objekti. (www.json.org)
 emport.parseError=JSON j\u00e4sennysvirhe: {0}
-emport.user.username=K\u00e4ytt\u00e4j\u00e4ll\u00e4 ei ole 'username'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.user.username=K\u00e4ytt\u00e4j\u00e4ll\u00e4 ei ole ’username’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.user.prefix=K\u00e4ytt\u00e4j\u00e4 ''{0}'': {1}
-emport.view.missingType=N\u00e4ytt\u00f6 XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa eik\u00e4 sill\u00e4 ole 'type'-arvoa. Sallitut arvot ovat {1}
-emport.dataSource.xid=Datal\u00e4hde nimell\u00e4 ''{0}'', ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
-emport.dataSource.missingType=Datal\u00e4hde XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa eik\u00e4 sill\u00e4 ole 'type'-arvoa. Sallitut arvot ovat {1}
-emport.dataSource.invalidType=Datal\u00e4hde XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa ja sill\u00e4 on virheellinen 'type'-arvo: ''{1}''. Sallitut arvot ovat {2}
+emport.view.missingType=N\u00e4ytt\u00f6 XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa eik\u00e4 sill\u00e4 ole ’type’-arvoa. Sallitut arvot ovat {1}
+emport.dataSource.xid=Datal\u00e4hde nimell\u00e4 ''{0}'', ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.dataSource.missingType=Datal\u00e4hde XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa eik\u00e4 sill\u00e4 ole ’type’-arvoa. Sallitut arvot ovat {1}
+emport.dataSource.invalidType=Datal\u00e4hde XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa ja sill\u00e4 on virheellinen ’type’-arvo: ''{1}''. Sallitut arvot ovat {2}
 emport.dataSource.prefix=Datal\u00e4hde ''{0}'': {1}
-emport.dataPoint.xid=Piste nimell\u00e4 ''{0}'' ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.dataPoint.xid=Piste nimell\u00e4 ''{0}'' ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.dataPoint.badReference=Piste XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa ja viittaa datal\u00e4hteeseen jota ei ole olemassa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.dataPoint.prefix=Piste ''{0}'': {1}
 emport.userPermission.prefix=Oikeudet k\u00e4ytt\u00e4j\u00e4lle ''{0}'': {1}
 emport.added=lis\u00e4tty
 emport.saved=tallennettu
 emport.causedBy=aiheuttaja:
-emport.view.xid=N\u00e4yt\u00f6ll\u00e4 ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.view.xid=N\u00e4yt\u00f6ll\u00e4 ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.view.prefix=N\u00e4ytt\u00f6 ''{0}'': {1}
 emport.pointHierarchy.prefix=Pistehierarkia: {0}
-emport.pointLink.xid=Pistelinkill\u00e4 ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.pointLink.xid=Pistelinkill\u00e4 ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.pointLink.prefix=Pistelinkki ''{0}'': {1}
-emport.scheduledEvent.xid=Ajastetulla tapahtumalla ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.scheduledEvent.xid=Ajastetulla tapahtumalla ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.scheduledEvent.prefix=Ajastettu tapahtuma ''{0}'': {1}
-emport.compoundEvent.xid=Yhdistelm\u00e4tapahtumalla ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.compoundEvent.xid=Yhdistelm\u00e4tapahtumalla ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.compoundEvent.prefix=Yhdistelm\u00e4tapahtuma ''{0}'': {1}
-emport.mailingList.xid=Postituslistalla ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.mailingList.xid=Postituslistalla ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.mailingList.prefix=Postituslista ''{0}'': {1}
-emport.eventHandler.xid=Pistelinkill\u00e4 ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.eventHandler.xid=Pistelinkill\u00e4 ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.eventHandler.prefix=Pistelinkki ''{0}'': {1}
-emport.publisher.xid=Datal\u00e4hde nimell\u00e4 ''{0}'' ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
-emport.publisher.missingType=Julkaisija XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa eik\u00e4 sill\u00e4 ole 'type'-arvoa. Sallitut arvot ovat {1}
-emport.publisher.invalidType=Julkaisija XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa ja sill\u00e4 on virheellinen 'type'-arvo:''{1}''. Sallitut arvot ovat {2}
+emport.publisher.xid=Datal\u00e4hde nimell\u00e4 ''{0}'' ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.publisher.missingType=Julkaisija XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa eik\u00e4 sill\u00e4 ole ’type’-arvoa. Sallitut arvot ovat {1}
+emport.publisher.invalidType=Julkaisija XID:ll\u00e4 ''{0}'' ei ole viel\u00e4 olemassa ja sill\u00e4 on virheellinen ’type’-arvo:''{1}''. Sallitut arvot ovat {2}
 emport.publisher.prefix=Julkaisija ''{0}'': {1}
-emport.watchList.xid=Seurannalla ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.watchList.xid=Seurannalla ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.watchList.prefix=Seuranta ''{0}'': {1}
-emport.maintenanceEvent.xid=Yll\u00e4pitotapahtumalla ei ole 'xid'-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
+emport.maintenanceEvent.xid=Yll\u00e4pitotapahtumalla ei ole ’xid’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.maintenanceEvent.prefix=Yll\u00e4pitotapahtuma ''{0}'': {1}
 
 eventHandlers.recipTestEmailMessage=T\u00e4m\u00e4 viesti on l\u00e4hetettu testin\u00e4 tapahtumak\u00e4sittelij\u00e4n postituslistalta
@@ -1270,8 +1270,7 @@ login.loginButton=Kirjaudu
 login.unknownBrowser=Tarkistetaan selaimen yhteensopivuus...
 login.supportedBrowser=T\u00e4m\u00e4 selain on tuettu.
 login.unsupportedBrowser=Selaimesi voi toimia, mutta ei ole viralliesti Serotonin Softwaren tukema. \
- Suosittelemme k\u00e4ytt\u00e4m\u00e4\u00e4n <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, tai \
-Internet Explorer 7.
+ Suosittelemme k\u00e4ytt\u00e4m\u00e4\u00e4n Mozilla Firefox, Google Chrome.
 login.nag=Huom: Koska selaimesi ei ole virallisesti tuettu, on mahdollista, ett\u00e4 aiheutuu ongelmia ScadaLTS kanssa. Kehotamme  p\u00e4ivitt\u00e4m\u00e4\u00e4n selaimen.  
 
 mailingLists.added=Postituslista lis\u00e4tty
@@ -1339,7 +1338,7 @@ notes.cancel=Peruuta
 notes.timeByUsername=time by username
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pointDetails.recordCountError=Tallenteiden m\u00e4\u00e4r\u00e4 pit\u00e4\u00e4 olla numero
 pointDetails.timePeriodError=Aikajakso pit\u00e4\u00e4 olla numero
 pointDetails.imageCountError=Kuvam\u00e4\u00e4r\u00e4 pit\u00e4\u00e4 olla numero
@@ -1375,7 +1374,7 @@ pointDetails.accessType=P\u00e4\u00e4sy
 pointEdit.buttons.enable=P\u00e4\u00e4lle
 pointEdit.buttons.disable=Pois k\u00e4yt\u00f6st\u00e4
 pointEdit.buttons.restart=Uudelleenk\u00e4ynnistys
-pointEdit.buttons.note=<span class="smallTitle">Huom:</span> Pisteen tallentaminen, sammuttaminen tai uudelleenk\u00e4ynnistys asettaa kaikki tapahtumat takaisin normaaliin.
+pointEdit.buttons.note=pisteen tallentaminen, sammuttaminen tai uudelleenk\u00e4ynnistys asettaa kaikki tapahtumat takaisin normaaliin.
 
 pointEdit.chart.props=Kaavion asetukset
 pointEdit.chart.type=Tyyppi
@@ -1528,7 +1527,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.areYouSureToMoveElement=Are you sure to move element?
 pointHierarchySLTS.movedElement=Moved element
@@ -1725,7 +1724,7 @@ scheduledEvents.validate.inactiveTrigger=Virhe luotaessa palautumisliipaisin: {0
 scheduledEvents.validate.aliasTooLong=Alias ei voi olla pidempi kuin 50 merkki\u00e4
 scheduledEvents.validate.invalidRtn=Palautumisaika pit\u00e4\u00e4 olla ennen aktivointiaikaa
 
-sql.warning=<span class="formError">Varoitus:</span> k\u00e4yt\u00e4 t\u00e4t\u00e4 ominaisuutta omalla vastuulla. Virheellinen k\u00e4ytt\u00f6 voi aiheuttaa tietojen h\u00e4vi\u00e4mist\u00e4 ja/tai j\u00e4rjestelm\u00e4vian. 
+sql.warning= k\u00e4yt\u00e4 t\u00e4t\u00e4 ominaisuutta omalla vastuulla. Virheellinen k\u00e4ytt\u00f6 voi aiheuttaa tietojen h\u00e4vi\u00e4mist\u00e4 ja/tai j\u00e4rjestelm\u00e4vian. 
 sql.sql=SQL
 sql.query=L\u00e4het\u00e4 kysely
 sql.update=L\u00e4het\u00e4 p\u00e4ivitys
@@ -1743,8 +1742,8 @@ systemSettings.upToDate=Mango on ajantasainen
 systemSettings.emailSettings=S\u00e4hk\u00f6postiasetukset
 systemSettings.smtpHost=SMTP palvelin
 systemSettings.smtpPort=SMTP portti
-systemSettings.fromAddress='Kenelt\u00e4'-osoite
-systemSettings.fromName='Kenelt\u00e4'-nimi
+systemSettings.fromAddress=’Kenelt\u00e4’-osoite
+systemSettings.fromName=’Kenelt\u00e4’-nimi
 systemSettings.auth=K\u00e4yt\u00e4 tunnuksia
 systemSettings.smtpUsername=K\u00e4ytt\u00e4j\u00e4
 systemSettings.smtpPassword=Salasana
@@ -1907,7 +1906,7 @@ viewEdit.compound.duration=Jakso
 
 views.title=Graafiset n\u00e4yt\u00f6t
 views.newView=Uusi n\u00e4ytt\u00f6
-views.noViews=Et ole luonut viel\u00e4 yht\u00e4\u00e4n n\u00e4ytt\u00f6\u00e4. Tee <a href="view_edit.shtm">nyt</a>.
+views.noViews=Et ole luonut viel\u00e4 yht\u00e4\u00e4n n\u00e4ytt\u00f6\u00e4. Tee 
 
 watchlist.addToWatchlist=Lis\u00e4\u00e4 seurantaan
 watchlist.points=Pisteet
@@ -2018,7 +2017,7 @@ event.system.process=Prosessi-tapahtuman virhe
 
 event.audit.added=K\u00e4ytt\u00e4j\u00e4 "{0}" loi kohteen "{1} Id:{2}", asetuksilla: {3}
 event.audit.changed=K\u00e4ytt\u00e4j\u00e4 "{0}" muutti kohteen "{1} Id:{2}", asetuksia: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" --> "{2}"
+event.audit.changedProperty={0}: "{1}" --> "{2}"
 event.audit.compoundEventDetector=Yhdistem\u00e4tapahtuma
 event.audit.dataPoint=Piste
 event.audit.dataSource=Datal\u00e4hde
@@ -2027,7 +2026,7 @@ event.audit.eventHandler=Tapahtumak\u00e4sittelij\u00e4
 event.audit.maintenanceEvent=Yll\u00e4pitotapahtuma
 event.audit.pointEventDetector=Pistetapahtuma
 event.audit.pointLink=Pistelinkki
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2587,8 +2586,8 @@ engUnit.188=newtons per meter
 engUnit.189=watts per meter per degree kelvin
 engUnit.190=kilometers
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.2=mA
 engUnit.abbr.3=A
 engUnit.abbr.4=ohms
@@ -3109,7 +3108,7 @@ viewEdit.graphic.whenOffLabel=Label when OFF (0, false)
 viewEdit.graphic.text=Text
 script.dpCommands=Datapoints commands
 dsEdit.nodaves7.writeBaseCmd=Write command line
-emport.versionError=The project version ({0}) isn't compatible with current system version ({1})
+emport.versionError=The project version ({0}) isn’t compatible with current system version ({1})
 events.export.ackedByDeletedUser=(user deleted)
 dsEdit.jmx.attributeName=Attribute name
 dsEdit.opc.tagName=Tag Name
@@ -3452,16 +3451,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=Huom:
+sql.warning.prefix=Varoitus:
+views.noViews.prefix=nyt.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_fr.properties b/test/messages_fr.properties
index 4a1d179507..46d62a9a69 100644
--- a/test/messages_fr.properties
+++ b/test/messages_fr.properties
@@ -106,7 +106,7 @@ common.gettingData=Obtenir les données
 common.help=Aide
 common.imageChart=Image de chart
 common.inactive=Inactive
-common.inactiveTime=Période d'inactivité
+common.inactiveTime=Période d’inactivité
 common.inception=Origine;Création
 common.latest=Fin
 common.maximize=Etendre
@@ -151,14 +151,14 @@ common.stats.end=Fin
 common.stats.logEntries=Entrées de journal
 common.stats.max=Maximum
 common.stats.min=Minimum
-common.stats.runtime=Durée d'exécution
+common.stats.runtime=Durée d’exécution
 common.stats.start=Début
 common.stats.starts=Débute
 common.stats.sum=Somme
 common.stats.value=Valeur
 common.status=Status
 common.testEmailSent=E-mail de test a été envoyé''{0}''
-common.thumb.invalidValue=Valeur de consigne n'est pas une image
+common.thumb.invalidValue=Valeur de consigne n’est pas une image
 common.time=Date
 common.tp.day=jour
 common.tp.days=jour(s)
@@ -732,7 +732,7 @@ dsEdit.mbus.vifeTypes=Types Vif
 dsEdit.mbus.vifLabel=Etiquette vif 
 dsEdit.mbus.vifType=Type Vif 
 dsEdit.mbus=MBus
-dsEdit.meta.delay=Délai d’éxécution<br/>
+dsEdit.meta.delay=Délai d’éxécution 
 dsEdit.meta.desc=Propriétés de source de données Meta
 dsEdit.meta.event.context=Mise à jour de contexte
 dsEdit.meta.event.cron=Modèle Cron
@@ -743,7 +743,7 @@ dsEdit.meta.event=Mise à jour évènement
 dsEdit.meta.event.week=Début de la semaine 
 dsEdit.meta.event.year=Début de l’année
 dsEdit.meta.event.month=Début du mois
-dsEdit.meta.noPoints=Aucun point n'a été ajouté au contexte de script
+dsEdit.meta.noPoints=Aucun point n’a été ajouté au contexte de script
 dsEdit.meta.pointName=Nom du point
 dsEdit.meta.script=Script
 dsEdit.meta.scriptContext=Contexte du script
@@ -854,7 +854,7 @@ dsEdit.modbusSerial.parity.space=Espace
 dsEdit.modbusSerial.parity=Parité
 dsEdit.modbusSerial.port=Port
 dsEdit.modbus.settableOverride=Settable
-dsEdit.modbusSerial.stopBits=Bits d'arrêt
+dsEdit.modbusSerial.stopBits=Bits d’arrêt
 dsEdit.name=Nom
 dsEdit.nmea.baud=Vitesse de transmission
 dsEdit.nmea.binary0Value=Valeur 0 binaire
@@ -1077,8 +1077,8 @@ dsEdit.updatePeriod=Mise à jour période
 dsEdit.validate.required=Valeur requise
 dsEdit.viconics.channel=Canal viconics
 dsEdit.viconics.chipRevision=Révision Chip viconics			
-dsEdit.viconics.chipRevisionBr=Chip<br/>révision viconics
-dsEdit.viconics.commAddress=Comm<br/>adresse viconics
+dsEdit.viconics.chipRevisionBr=Chip révision viconics
+dsEdit.viconics.commAddress=Comm adresse viconics
 dsEdit.viconics.convertCelsius=Convertir températures en Celsius
 dsEdit.viconics.crss=CRSS Viconics
 dsEdit.viconics.dataSourceNotStarted=Source des données n’est pas démarré
@@ -1087,9 +1087,9 @@ dsEdit.viconics.deviceRemove=supprimer le périphérique (s)
 dsEdit.viconics.devices=Périphériques viconics
 dsEdit.viconics.deviceWarning=Délai de périphérique déconnecté(s)
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Canal: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>révision
+dsEdit.viconics.firmwareRevision=Firmware révision
 dsEdit.viconics.ieee=IEEE viconics
-dsEdit.viconics.modelNumber=Model<br/>numéro
+dsEdit.viconics.modelNumber=Model numéro
 dsEdit.viconics.networkIdentifyFailure=Identification réseau échoué: {0}
 dsEdit.viconics.networkInfo=Information réseau
 dsEdit.viconics.networkTimeout=Délai de réseau déconnecté(s)
@@ -1103,9 +1103,9 @@ dsEdit.viconics.timeout=Délai message viconics
 dsEdit.viconics.trss=TRSS viconics
 dsEdit.viconics.unreliable=Valeur du point peut ne pas être fiable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee révision firmware 
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>révision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware révision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee adresse réseau
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>adresse
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network adresse
 dsEdit.viconics=Viconics thermostats sans fil
 dsEdit.virtual.attractionPoint=Point d’attraction
 dsEdit.virtual.change=Changement virtuelle
@@ -1250,7 +1250,7 @@ emport.importProjectTitle=Importer projet (Upload)
 emport.includePointValues=Inclure valeurs de points
 emport.indent=Niveau de retrait
 emport.invalidFile=Lecture de fichier échoué ({0})
-emport.invalidImportData=Importer des données n’est pas valide: n’est pas un objet JSON
+emport.invalidImportData=Importer des données n’est pas valide: n’est pas un objet JSON. (www.json.org)
 emport.invalidProjectName=Nom invalide
 emport.mailingList.prefix=Liste de diffusion ''{0}'': {1}
 emport.mailingList.xid=Une liste de diffusion n’a pas de valeur ‘xid’. Ignoré.
@@ -1266,7 +1266,7 @@ emport.pointValuesMax=Valeurs max de points
 emport.projectDescription=Description
 emport.projectName=Nom de projet
 emport.publisher.invalidType=Éditeur avec XID ''{0}'' n’existe pas et a une valeur non valide ""type"" de ''{1}''. Les types valides sont {2}
-emport.publisher.missingType=Éditeur avec XID'' {0}''n’existe pas encore et n’a pas de valeur ‘type’. Les types valides sont {1}
+emport.publisher.missingType=Éditeur avec XID'' {0}'' n’existe pas encore et n’a pas de valeur ‘type’. Les types valides sont {1}
 emport.publisher.prefix=Éditeur ''{0}'': {1}
 emport.publisher.xid=Une source de données avec nom ''{0}'' ne pas avoir de valeur ‘xid’. Ignoré.
 emport.saved=sauvegardé
@@ -1483,8 +1483,8 @@ engUnit.99=pourcent par seconde
 engUnit.190=kilomètres
 engUnit.abbr.190=km
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=mégavolt ampères
 engUnit.abbr.100=par minute
 engUnit.abbr.101=par seconde
@@ -1705,7 +1705,7 @@ event.alarmMaxDecreased=Niveau d’alarme maximal a diminué de {0} vers {1}
 event.alarmMaxIncreased=Niveau d’alarme maximal a augmenté de {0} vers {1}
 event.audit.added=Utilisateur ""{0}"" créé {1} avec id {2}: {3}
 event.audit.changed=Utilisateur ""{0}"" changé {1} avec id {2}: {3}
-event.audit.changedProperty=<br/>""{0}"" ""{1}"" à ""{2}""
+event.audit.changedProperty= ""{0}"" ""{1}"" à ""{2}""
 event.audit.compoundEventDetector=Détecteur d’évènement du composé
 event.audit.dataPoint=Point de données
 event.audit.dataSource=Source de données
@@ -1714,7 +1714,7 @@ event.audit.eventHandler=Gestionnaire d’évènements
 event.audit.maintenanceEvent=Évènement de maintenance
 event.audit.pointEventDetector=Point de détecteur d’évènements
 event.audit.pointLink=Point de lien
-event.audit.property=<br/>""{0}""=""{1}""
+event.audit.property= ""{0}""=""{1}""
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2081,7 +2081,7 @@ ftl.eventActive=Scada-LTS notification d’évènements actif
 ftl.eventInactive=Cet évènement est inactif à ce moment
 ftl.footer=Si vous avez reçu ce message par erreur, s’il vous plaît ne pas tenir compte.
 ftl.htmlFooter.automated=Cet e-mail a été envoyé par un système automatique. Il a été envoyé vers vous parce que vous avez été inscrit sur la liste d’envoi d’une notification d’e-mail Scada-LTS. S’il vous plaît ne répondez pas à cet e-mail.
-ftl.htmlFooter.mango=Scada-LTS (by Abil'I.T.)
+ftl.htmlFooter.mango=Scada-LTS (by Abil’I.T.)
 ftl.manual=Cet évènement nécessite une confirmation manuelle pour qu’il devienne inactif
 ftl.note=Note
 ftl.originalInformation=Origine d’informations d’évènement 
@@ -2162,7 +2162,7 @@ header.scripts=Scripte
 header.setHomeUrl=Faire de ceci ma page de défaut
 header.sql=SQL
 header.systemSettings=Paramètres du système
-header.title=Scada-LTS (by Abil'I.T.)
+header.title=Scada-LTS (by Abil’I.T.)
 header.toggleMute=Mute
 header.unmute=Réactiver
 header.user=Utilisateur
@@ -2191,7 +2191,7 @@ login.nag=NOTE: vous pouvez avoir des problèmes avec ScadaLTS parce que votre n
 login.password=Mot de passe
 login.supportedBrowser=Ce navigateur est supporté.
 login.unknownBrowser=Vérification de votre navigateur pour la compatibilité...
-login.unsupportedBrowser=Ce navigateur devrait fonctionner, mais n'est pas officiellement supporté. Nous vous recommandons d'utiliser <a href=""http://www.mozilla.com/"" target=""_blank"">Firefox</a> ou Chrome.
+login.unsupportedBrowser=Ce navigateur devrait fonctionner, mais n'est pas officiellement supporté. Nous vous recommandons d'utiliser Mozilla Firefox, Google Chrome.
 login.userId=Id de l’utilisateur
 login.validation.accountDisabled=Votre compte a été désactivé. S’il vous plaît contactez votre administrateur
 login.validation.invalidLogin=Connexion incorrecte, s&rsquo;il vous plaît essayer à nouveau
@@ -2247,7 +2247,7 @@ maintenanceEvents.type.year=Annuel
 maintenanceEvents.type=Type planifié
 maintenanceEvents.validate.activeCron=Erreur dans l’expression cron active: {0}
 maintenanceEvents.validate.activeTrigger=Erreur de création de déclencheur actif: {0}
-maintenanceEvents.validate.aliasTooLong=Alias trop long <ne peut pas contenir plus de 50 caractères>
+maintenanceEvents.validate.aliasTooLong=Alias trop long (ne peut pas contenir plus de 50 caractères)
 maintenanceEvents.validate.inactiveCron=Erreur dans l’expression cron inactive: {0}
 maintenanceEvents.validate.inactiveTrigger=Erreur de création de déclencheur inactif: {0}
 maintenanceEvents.validate.invalidRtn=Temps d’inactivité doit être après le temps d’activité
@@ -2261,7 +2261,7 @@ notes.timeByUsername=Temps par utilisateur
 notes.userNotes=Notes d’utilisateur
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pagination.ascending=Ascendant
 pagination.descending=Descendant
 pagination.next=Prochain
@@ -2303,7 +2303,7 @@ pointDetails.username=Nom d’utilisateur
 pointDetails.views=Vues
 pointEdit.buttons.disable=Déscativer
 pointEdit.buttons.enable=Activer
-pointEdit.buttons.note=<span class=""smallTitle"">Note:</span> la sauvegarde, la désactivation, ou le redémarrage d’un point entraîne tous les évènements actifs à retourner à la normale
+pointEdit.buttons.note=la sauvegarde, la désactivation, ou le redémarrage d’un point entraîne tous les évènements actifs à retourner à la normale
 pointEdit.buttons.restart=Redémarrer
 pointEdit.chart.includeSum=Inclure somme
 pointEdit.chart.invalidLimit=Tableau rendu: limite doit être entre 2 et 50
@@ -2553,7 +2553,7 @@ reports.commentList.type.event=Évèvenement
 reports.commentList.type.point=Point
 reports.commentList.type=Type
 reports.commentList.typeKey=Taper clé
-reports.comments=Commentaires d'utilisateur
+reports.comments=Commentaires d’utilisateur
 reports.consolidated=Tableau consolidé
 reports.consolidatedChart=Diagramme consolidé
 reports.criteria=Critères de rapport
@@ -2665,7 +2665,7 @@ sql.query=Envoyer requête
 sql.rowsUpdated=Enregistrement(s) à jour.      
 sql.sql=SQL
 sql.update=Envoyer mise à jour
-sql.warning=<span class=""formError"">Attention:</span> utiliser cette fonction à vos risques. Une utilisation incorrecte peut entraîner des données corrompues et/ou des failles de système. 
+sql.warning=utiliser cette fonction à vos risques. Une utilisation incorrecte peut entraîner des données corrompues et/ou des failles de système. 
 systemSettings.auditAlarmLevels=Niveaux d’alarmes d’évènements d’audit
 systemSettings.auditAlarmLevelsSaved=Niveaux d’alarmes d’évènements d’audit ont été sauvegardés
 systemSettings.auth=Autorisation d’utilisation
@@ -2684,11 +2684,11 @@ systemSettings.fromAddress="De" adresse
 systemSettings.fromName="De" nom
 systemSettings.futureDateLimit=Jeter valeurs de points futures datées de plus de
 systemSettings.groveLogging=Envoyer erreurs à Sérotonine
-systemSettings.historyCount=Compte de l'histoire
+systemSettings.historyCount=Compte de l’histoire
 systemSettings.httpSaved=Paramètres Http ont été sauvegardés 
 systemSettings.httpSettings=Paramètres HTTP
-systemSettings.instanceDescription=Description de l'instance 
-systemSettings.instanceId=Identifiant de l'instance
+systemSettings.instanceDescription=Description de l’instance 
+systemSettings.instanceId=Identifiant de l’instance
 systemSettings.langSaved=Langue a été sauvegardée
 systemSettings.languageSettings=Paramètres de langue
 systemSettings.miscSaved=les Paramètres ont été sauvegardés
@@ -2700,11 +2700,11 @@ systemSettings.otherSettings=Autres paramètres
 systemSettings.proxyHost=Hôte proxy 
 systemSettings.proxyPassword=Mot de passe proxy
 systemSettings.proxyPort=Port proxy
-systemSettings.proxyUsername=Nom d'utilisateur proxy
+systemSettings.proxyUsername=Nom d’utilisateur proxy
 systemSettings.purgeData=Purger toutes les données
 systemSettings.purgeDataComplete=Purge totale. {0} échantillons de points supprimés.
 systemSettings.purgeDataConfirm=Cela purgera tous les échantillons de points de la base de données. Etes-vous sûr?
-systemSettings.purgeDataInProgress=Purge toutes les données, s'il vous plaît attendre...
+systemSettings.purgeDataInProgress=Purge toutes les données, s’il vous plaît attendre...
 systemSettings.purgeEvents=Purger évènements plus vieux que
 systemSettings.purgeNow=Purger maintenant en utilisant des paramètres de point
 systemSettings.purgeReports=Purger les instances de rapport plus vieilles que
@@ -2712,9 +2712,9 @@ systemSettings.retrieving=(récupération)
 systemSettings.smtpHost=Hôte SMTP
 systemSettings.smtpPassword=Mot de passe
 systemSettings.smtpPort=Port SMTP
-systemSettings.smtpUsername=Nom d'utilisateur
-systemSettings.systemAlarmLevels=Niveaux d'alarmes d'évènements du système
-systemSettings.systemAlarmLevelsSaved=Niveaux d'alarmes d'évènements du système ont été sauvegardés
+systemSettings.smtpUsername=Nom d’utilisateur
+systemSettings.systemAlarmLevels=Niveaux d’alarmes d'évènements du système
+systemSettings.systemAlarmLevelsSaved=Niveaux d’alarmes d'évènements du système ont été sauvegardés
 systemSettings.systemInformation=Informations du système
 systemSettings.systemLanguage=Langage du système
 systemSettings.testEmail=Un e-mail de test avec vos paramètres du système a été envoyé avec succès.
@@ -2724,16 +2724,16 @@ systemSettings.totalSize=Taille totale
 systemSettings.uiPerformance.high=Haute
 systemSettings.uiPerformance.low=Basse
 systemSettings.uiPerformance.med=Moyenne
-systemSettings.uiPerformance=Performance de l'UI
+systemSettings.uiPerformance=Performance de l’UI
 systemSettings.upToDate=Cette instance de Scada-LTS est à jour
 systemSettings.useProxy=Utiliser proxy
 systemSettings.validation.invalidColour=Couleur invalide
-systemSettings.versionCheck1=Temps de pause du socket lors d'un contrôle. S'il vous plaît essayer à nouveau
-systemSettings.versionCheck2=Une erreur s'est produite: {0}: {1}
+systemSettings.versionCheck1=Temps de pause du socket lors d’un contrôle. S’il vous plaît essayer à nouveau
+systemSettings.versionCheck2=Une erreur s’est produite: {0}: {1}
 systemSettings.versionSaved=Paramètres de version ont été sauvés
 textRenderer.analog=Analogue
 textRenderer.binary=Binaire
-textRenderer.engineeringUnits=Unités d'ingénierie
+textRenderer.engineeringUnits=Unités d’ingénierie
 textRenderer.multistate=Multi-état
 textRenderer.none=Aucun
 textRenderer.plain=Ordinaire
@@ -2743,12 +2743,12 @@ users.add=Ajouter utilisateur
 users.added=Utilisateur ajouté
 users.dataSources=Source de données
 users.deleteConfirm=Etes-vous sûr de vouloir supprimer cet utilisateur?
-users.details=Détails d'utilisateur
+users.details=Détails d’utilisateur
 users.email=E-mail
 users.newPassword=Nouveau mot de passe
 users.phone=Téléphone
-users.receiveAlarmEmails=Envoyer des e-mails d'alarme
-users.receiveOwnAuditEvents=Recevez propres évènements d'audit
+users.receiveAlarmEmails=Envoyer des e-mails d’alarme
+users.receiveOwnAuditEvents=Recevez propres évènements d’audit
 users.hideMenu=Masquer le menu
 users.theme=Thème
 users.theme.default=Défaut
@@ -2757,19 +2757,19 @@ users.homeUrl=Home URL
 users.saved=Utilisateur sauvegardé
 users.title=Utilisateur
 users.user=Utilisateur
-users.username=Nom d'utilisateur
+users.username=Nom d’utilisateur
 users.firstName=Prénom
 users.lastName=Nom de famille
 users.validate.adminDisable=Vous ne pouvez pas désactiver votre compte
-users.validate.adminInvalid=Vous ne pouvez pas supprimer vos propres privilèges d'administrateur
+users.validate.adminInvalid=Vous ne pouvez pas supprimer vos propres privilèges d’administrateur
 users.validate.badDelete=Vous ne pouvez pas effacer votre compte
 users.validate.emailRequired=E-mail est requis
 users.validate.emailTooLong=E-mail ne peut pas contenir plus de 255 caractères
 users.validate.phoneTooLong=Téléphone ne peut pas être plus long que 40 caractères
-users.validate.usernameInUse=Nom d'utilisateur est déjà  utilisé
-users.validate.usernameRequired=Nom d'utilisateur est requis
-users.validate.usernameTooLong=Nom d'utilisateur ne peut pas contenir plus de 40 caractères
-users.validate.usernameUnique=Nom d'utilisateur doit être unique
+users.validate.usernameInUse=Nom d’utilisateur est déjà  utilisé
+users.validate.usernameRequired=Nom d’utilisateur est requis
+users.validate.usernameTooLong=Nom d’utilisateur ne peut pas contenir plus de 40 caractères
+users.validate.usernameUnique=Nom d’utilisateur doit être unique
 validate.0to15=Doit être entre 0 et 15 inclus
 validate.0toArg=Doit être entre 0 et {0} inclus
 validate.1to240=Doit être entre 1 et 240 inclus
@@ -2788,15 +2788,15 @@ validate.duplicateVarName=Duplicat de nom de variable: {0}
 validate.fieldName=Un des noms de domaine de requête ou de déclaration de mise à jour doivent être fournis
 validate.greaterThan1s=Ne peut pas être moins que 2 secondes
 validate.greaterThanDiscardLow=Doit être supérieur à limite basse d'écart
-validate.greaterThanEngLow=Doit être supérieur à l'échelle d'ingénierie d'unité de valeur faible 
+validate.greaterThanEngLow=Doit être supérieur à l'échelle d’ingénierie d’unité de valeur faible 
 validate.greaterThanRawLow=Doit être supérieur à l'échelle de valeur brute faible
 validate.greaterThanZero=Doit être supérieur à zéro
 validate.illegalValue=Valeur illégale
-validate.imageExtension=Format d'image invalide!
+validate.imageExtension=Format d’image invalide!
 validate.invalidAddress=Adresse de capteur invalide: {0}
 validate.invalidCharset=Ensemble de noms de caractères invalide
 validate.invalidChoice=Choix invalide
-validate.invalidCron=Erreur dans l'expression de cron: {0}
+validate.invalidCron=Erreur dans l’expression de cron: {0}
 validate.invalidValue=Valeur invalide
 validate.invalidVarName=Nom de variable non valide: {0}
 validate.lessThan100=Ne peut pas être > 100
@@ -2809,7 +2809,7 @@ validate.notLessThan30s=Ne peut pas être moins que 30 secondes
 validate.notLongerThan=Ne peut pas contenir plus de {0} caractères
 validate.pachube.dataStreadIdRequired=id de flux de données est requis
 validate.parameterRequired=Nom de paramètre est requis
-validate.parseError=Erreur d'analyse: {0}
+validate.parseError=Erreur d’analyse: {0}
 validate.ped.xidMissing=Tous les détecteurs d'évènements doivent définir un XID. Non sauvegardé
 validate.ped.xidUsed=Le même XID ''{0}'' est en utilisation pour multiples détecteurs d'évènements. Non sauvegardés
 validate.required=Valeur requise
@@ -2842,12 +2842,12 @@ viewEdit.graphic.height=Hauteur
 viewEdit.graphic.hideAckColumn=Cacher colonne Ack
 viewEdit.graphic.hideAlarmLevelColumn=Cacher colonne de niveau
 viewEdit.graphic.hideIdColumn=Cacher ID de colonne
-viewEdit.graphic.hideInactivityColumn=Cacher colonne d'inactivité
+viewEdit.graphic.hideInactivityColumn=Cacher colonne d’inactivité
 viewEdit.graphic.hideTimestampColumn=Cacher la colonne des horodatages
 viewEdit.graphic.image=Image
 viewEdit.graphic.images=Images
-viewEdit.graphic.imageSample=Échantillon d'image
-viewEdit.graphic.imageSet=Ensemble d'images
+viewEdit.graphic.imageSample=Échantillon d’image
+viewEdit.graphic.imageSet=Ensemble d’images
 viewEdit.graphic.invalidMinMax=Min doit être inférieur au Max
 viewEdit.graphic.invalidScale=Pourcentage d'échelle ne peut pas  être inférieur à 1
 viewEdit.graphic.invalidState=Valeur d'état non analysable en
@@ -2857,7 +2857,7 @@ viewEdit.graphic.maxListSize=Taille max de liste
 viewEdit.graphic.min=Min
 viewEdit.graphic.missingDefault=Une image de défault doit être sélectionnée
 viewEdit.graphic.missingDynamicImage=Vous devez selectionner une image dynamique
-viewEdit.graphic.missingImageSet=Vous devez selectionner un ensemble d'images
+viewEdit.graphic.missingImageSet=Vous devez selectionner un ensemble d’images
 viewEdit.graphic.missingMax=Max doit être saisi
 viewEdit.graphic.missingMin=Min doit être saisi
 viewEdit.graphic.missingOneImage=Une image une doit être sélectionnée
@@ -2873,7 +2873,7 @@ viewEdit.graphic.runtimeMode=Mode temps de lecture
 viewEdit.graphic.saveToLoad=Sauvegardez vue pour charger composante!
 viewEdit.graphic.scale=Le Pourcentage d'échelle
 viewEdit.graphic.script=Le Script
-viewEdit.graphic.state=Missions d'image/état
+viewEdit.graphic.state=Missions d’image/état
 viewEdit.graphic.stateList=Liste d'état
 viewEdit.graphic.styleAttribute=Attribut de style
 viewEdit.graphic.text=Texte
@@ -2898,7 +2898,7 @@ viewEdit.viewDelete=Supprimer la vue:
 viewEdit.viewDeleteConfirm=Confirmer
 viedEdit.viewSize=La Taille
 views.newView=Nouvelle vue
-views.noViews=Vous n'avez pas créé de vues graphiques. En créer <a href=""view_edit.shtm"">now</a>.
+views.noViews=Vous n'avez pas créé de vues graphiques. En créer 
 views.title=Vues de graphique
 watchlist.addNewList=Ajouter nouvelle liste de surveillance
 watchlist.addToWatchlist=Ajouter à la liste de surveillance
@@ -2928,44 +2928,44 @@ dox.radiuinoDS=Source de données Radiuino
 dox.radiuinoPP=Point de données Radiuino 
 dox.scripts=Scripts
 dsEdit.asciiSerial.charStopMode.charASCII=Caractère ASCII 
-dsEdit.asciiSerial.charX=Jusqu'au caractère C
+dsEdit.asciiSerial.charX=Jusqu’au caractère C
 dsEdit.bacnetIp.gettingDeviceDetails=Récupération des informations sur les appareils...
 dsEdit.bacnetIp.remoteDeviceNetworkAddress=Adresse du réseau
 dsEdit.bacnetIp.remoteDeviceNetworkNumber=Numéro de réseau
 dsEdit.iec101.persistent=Persistant
-dsEdit.mbus.id=Identification de l'appareil
+dsEdit.mbus.id=Identification de l’appareil
 dsEdit.mbus.man=Man
 dsEdit.mbus.phoneNumber=Numéro de téléphone
 dsEdit.mbus.responseTimeOutOffset=Décalage de temps
-dsEdit.mbus.secAddrMedium=Support d'adresse sécondaire
+dsEdit.mbus.secAddrMedium=Support d’adresse sécondaire
 dsEdit.mbus.tcpAddr=Adresse TCP
 dsEdit.mbus.tcpIpBitPerSecond=Bit par séconde du TCP IP
 dsEdit.mbus.tcpPort=Port du TCP
 dsEdit.mbus.useTcpIpConnection=Utiliser une connexion TCP/IP 
 dsEdit.mbus.version=Version
-dsEdit.meta.generate.error=Erreur de création de l'histoire: {0}. {1} Mises à jour créées.
-dsEdit.meta.generate=Générer l'histoire
+dsEdit.meta.generate.error=Erreur de création de l’histoire: {0}. {1} Mises à jour créées.
+dsEdit.meta.generate=Générer l’histoire
 dsEdit.meta.generate.noData=Pas de données pour le point ''{0}''
-dsEdit.meta.generate.success=L'histoire a été créées avec succès. {0} Mises à jour créées.
+dsEdit.meta.generate.success=L’histoire a été créées avec succès. {0} Mises à jour créées.
 dsEdit.meta=Méta source de données 
 dsEdit.modbus.dpconn3=Contrôle des connexions
 dsEdit.modbusIp.createSocketMonitorPoint=Créer un point de surveillance des prises
 dsEdit.modbusIp.socketPointName=Surveillances des prises TCP
 dsEdit.modbusIp.transportType.tcpListener=Auditeur TCP
-dsEdit.modbus.scanner.startError=Un problème d'exploration s'est posé. Il est possible qu'il y ait une source de données active utilisant le port sélectionné. ({0})
+dsEdit.modbus.scanner.startError=Un problème d’exploration s’est posé. Il est possible qu’il y ait une source de données active utilisant le port sélectionné. ({0})
 dsEdit.modbusSerial=Série de Modbus
 dsEdit.nodaves7.desc=S7 Iso TCP Ethernet
 dsEdit.nodaves7=Contrôleur Ethernet S7 Iso TCP 
 dsEdit.nodaves7.s7writeBitOffset=Bit de décalage
-dsEdit.nodaves7.s7writeBytesQty=Quantité d'octets
+dsEdit.nodaves7.s7writeBytesQty=Quantité d’octets
 dsEdit.nodaves7.s7writeDBNUM=DBNUM
 dsEdit.nodaves7.s7writeMemoryArea=Zone de mémoire
 dsEdit.nodaves7.s7writeStarts=Décalage de la mémoire (Démarrage)
 dsEdit.nodaves7.writeBaseCmd=Write command line
-dsedit.opc.rt.addFailed=L'ajout a échoué pour{0}
+dsedit.opc.rt.addFailed=L’ajout a échoué pour{0}
 dsEdit.persistent.getStatus=Obtenir un statut
 dsEdit.persistent.status.connection={0}: connexions {1}, {2} paquet reçu
-dsEdit.persistent.status=État d'exécution
+dsEdit.persistent.status=État d’exécution
 dsEdit.persistent.status.noConnections=Pas de connexions
 dsEdit.persistent.status.notEnabled=Les sources de données ne sont pas activées
 dsEdit.radiuino.avancado=Avancé
@@ -2983,7 +2983,7 @@ dsEdit.radiuino.parity=Parité
 dsEdit.radiuino.pollingMode.false=Faux
 dsEdit.radiuino.pollingMode=Mode de sondage
 dsEdit.radiuino.pollingMode.true=Vrai
-dsEdit.radiuino.quantidadeByte=Quantité d'octets
+dsEdit.radiuino.quantidadeByte=Quantité d’octets
 dsEdit.radiuino=Radiuino
 dsEdit.radiuino.radiuinoDataType.1bUnsigned=Entier (non signé 1 octet)
 dsEdit.radiuino.radiuinoDataType.2bUnsigned=Entier (non signé 2 octets)
@@ -2998,10 +2998,10 @@ dsEdit.radiuino.sleepMode.false=Sans repos
 dsEdit.radiuino.sleepMode=Mode veille
 dsEdit.radiuino.sleepMode.true=Avec repos
 dsEdit.radiuino.sleepTime=Temps de repos
-dsEdit.radiuino.stopBits=Bits d'arrêt
+dsEdit.radiuino.stopBits=Bits d’arrêt
 dsEdit.radiuino.timeout=Temps mort (ms)
 dsEdit.serial.flowControlIn=Contrôle des flux entrant
-dsEdit.serial.inputBufferSize=Taille de la mémoire tampon d'entrée
+dsEdit.serial.inputBufferSize=Taille de la mémoire tampon d’entrée
 dsEdit.serial.outputBufferSize=Taille du tampon de sortie
 Edit.chart.missingPeriods=La période de temps du graphique doit être fixée
 emport.pointValue.missingPoint=Valeur du point''{0}'': Point de données non trouvé
@@ -3012,7 +3012,7 @@ event.persistent.xidTooLong=XID de ""{0}"" point est trop long.
 events.export.ackedByDeletedUser=(Utilisateur supprimé)
 events.export.ackedByMaintenance=Mode de maintenance
 events.export.ackedByUser={0}
-events.export=Evènements sur l'exportation
+events.export=Evènements sur l’exportation
 events.search.dateRange=Gamme de données
 events.search.dateRange.none=Aucune
 events.search.dateRange.relative=Relative
@@ -3037,7 +3037,7 @@ graphic.enhancedImageChart.config.y.max=Y-axis max:
 graphic.enhancedImageChart.config.y.min=Y-axis min:
 graphic.enhancedImageChart.config.zoomIn=Zoom avant
 graphic.enhancedImageChart.config.zoomOut=Zoom arrière
-graphic.enhancedImageChart=Charte d'image améliorée
+graphic.enhancedImageChart=Charte d’image améliorée
 graphic.enhancedImageChart.legend=Légende
 graphic.enhancedImageChart.point10=Point 10
 graphic.enhancedImageChart.point1=Point 1
@@ -3059,7 +3059,7 @@ graphic.enhancedImageChart.seriesConfig.seriesOptions=Options pour {0}:
 graphic.enhancedImageChart.seriesConfig.seriesOptions.strokeWidth=Largeur de la course:
 graphic.enhancedImageChart.seriesConfig.visibility=Visibilité des séries
 graphic.enhancedPoint=Point amélioré
-login.validation.noSuchUser=Impossible de trouver l'identifiant de l'utilisateur
+login.validation.noSuchUser=Impossible de trouver l’identifiant de l’utilisateur
 mport.graphicsFolder=Inclure les dossiers graphique
 mport.mailingList.prefix=Liste de courrier ''{0}'': {1}
 pointDetails.chartDataButton=Importer des données graphiques
@@ -3074,21 +3074,21 @@ publisherEdit.httpSender.point.status=Statut
 publisherEdit.httpSender.point.type=Type
 publisherEdit.pachube.noPoints=Pas de liste de points
 publisherEdit.persistent.getStatus=Obtenir statut
-publisherEdit.persistent.startSync=Synchroniser l'histoire
+publisherEdit.persistent.startSync=Synchroniser l’histoire
 publisherEdit.persistent.status.connected=Connecté
 publisherEdit.persistent.status.connecting=Point Connecté{0} à {1}
 publisherEdit.persistent.status.connectionState=Connexion: {0}
-publisherEdit.persistent.status=Etat d'exécution
+publisherEdit.persistent.status=Etat d’exécution
 publisherEdit.persistent.status.notConnected=Pas connecté
 publisherEdit.persistent.status.notEnabled=Editeur désactivé
-publisherEdit.persistent.status.packetQueueSize=Fil d'attente d'un paquet: {0}
+publisherEdit.persistent.status.packetQueueSize=Fil d’attente d’un paquet: {0}
 publisherEdit.persistent.status.pointCount=Nombre de point: {0}
-publisherEdit.persistent.status.queueSize=Mise à jour de la taille de la file d'attente: {0}
-publisherEdit.persistent.status.syncNotRunning=La synchronisation de l'historique n'est pas active
-publisherEdit.persistent.status.syncStatus=Statut de synchronisation de l'historique: Terminé {0} de {1} points, {2} demandes envoyées
+publisherEdit.persistent.status.queueSize=Mise à jour de la taille de la file d’attente: {0}
+publisherEdit.persistent.status.syncNotRunning=La synchronisation de l’historique n’est pas active
+publisherEdit.persistent.status.syncStatus=Statut de synchronisation de l’historique: Terminé {0} de {1} points, {2} demandes envoyées
 publisherEdit.persistent.xidPrefix=XID préfixe
 reports.zipData=Données au format .zip
-scripts.execution.scriptError=Echec de l'exécution du script
+scripts.execution.scriptError=Echec de l’exécution du script
 scripts.execution.success=Script éxécuté avec succès
 systemSettings.chartBackgroundColour=Couleur de fond du graphique
 systemSettings.colourSettings=Configuration des couleurs
@@ -3101,23 +3101,23 @@ systemSettings.dbConfiguration.Mysql=MySQL
 systemSettings.infoSaved=Les informations deconfiguration ont été sauvegardées
 systemSettings.plotBackgroundColour=Couleur de fond du tracé
 systemSettings.plotGridlinesColour=Couleur des lignes de quadrillage
-systemSettings.reServer=Redémarrer le serveur d'application
+systemSettings.reServer=Redémarrer le serveur d’application
 systemSettings.version=Version de ScadaLTS 
 systemSettings.customCss.title=Feuille de style personnalisée
 systemSettings.customCss.edit=Modifier le fichier
 systemSettings.customCss.dialog.title=Modifier le fichier de feuille de style personnalisé
-userProfiles.add=Ajouter un profil d'utilisateur
-userProfiles.added=Profil d'utilisateur ajouté.
-users.dataSaved=Données d'utilisateur sauvegardées
+userProfiles.add=Ajouter un profil d’utilisateur
+userProfiles.added=Profil d’utilisateur ajouté.
+users.dataSaved=Données d’utilisateur sauvegardées
 userProfiles.dataSources=Source de données
 userProfiles.deleteConfirm=Êtes-vous sûr de vouloir supprimer ce profil ?
-userProfiles.details=Détail du profil d'utilisateur
+userProfiles.details=Détail du profil d’utilisateur
 userProfiles.name=Nom du profil
 userProfiles.none=Aucun
 userProfiles.saved=Profil sauvegardé
-userProfiles.selectName=Profil d'utilisateur
-userProfiles.title=Gérer le profil de l'utilisateur
-userProfiles.validate.errorDeleting=Erreur de détection du profil de l'utilisateur!
+userProfiles.selectName=Profil d’utilisateur
+userProfiles.title=Gérer le profil de l’utilisateur
+userProfiles.validate.errorDeleting=Erreur de détection du profil de l’utilisateur!
 userProfiles.validate.nameUnique=Le nom du profil doit être unique et non vide
 userProfiles.validate.successDeleting=Profil supprimé avec succès.
 viewEdit.compound.point.alias=Alias
@@ -3133,7 +3133,7 @@ viewEdit.fullScreen=Plein écran
 watchlist.chartDataButton=Exporter les données des cartes
 watchlist.consolidatedChart=Inclure dans le tableau consolidé
 watchlist.createReport=Créer un rapport pour cette liste de surveillance
-watchlist.noExportables=Aucun point sélectionné pour l'exploitation
+watchlist.noExportables=Aucun point sélectionné pour l’exploitation
 watchlist.imageChartLiveButton=Démarrer/Arrêter graphique en direct
 script.execute.success=Exécuté avec succès
 script.execute.error=Erreur
@@ -3148,7 +3148,7 @@ menu.compound_event_detectors.tooltip=Détecteurs d'évènement composés
 menu.point_links.tooltip=Liens de points
 menu.scripting.tooltip=Scénario
 menu.users.tooltip=Utilisateurs
-menu.users_profiles.tooltip=Profils d'utilisateurs
+menu.users_profiles.tooltip=Profils d’utilisateurs
 menu.point_hierarchy.tooltip=Hiérarchies des points
 menu.mailing_lists.tooltip=Listes des diffusions
 menu.publishers.tooltip=Editeurs
@@ -3166,12 +3166,12 @@ menu.point_hierarchy.delete.tooltip=Supprimer dossier / Déplacer le point à la
 menu.point_hierarchy.refresh.tooltip=Rafraîchir
 menu.point_hierarchy.info.tooltip=Information
 ds.state.migrationOrErrorSerializeChangeEnableState=Pendant la lecture des données/migration/erreur sur le statut on/off des sources de données a été modifié
-ds.state.stopChangeEnableStateDs=En raison de la non-réponse du serveur externe et de l'arrêt des propriétés, les sources de données ont été arrêtées
-ds.state.userChangeEnableStateDs=L'utilisateur a modifié le statut on/off des sources de données
-ds.state.apiChangeEnableStateDs=Avec l'utilisation de l'API, le statut on/off des sources a été modifié
-ds.state.importChangeEnableStateDs=Lors de l'importation, le statut on/off des sources de données a été modifié
+ds.state.stopChangeEnableStateDs=En raison de la non-réponse du serveur externe et de l’arrêt des propriétés, les sources de données ont été arrêtées
+ds.state.userChangeEnableStateDs=L’utilisateur a modifié le statut on/off des sources de données
+ds.state.apiChangeEnableStateDs=Avec l’utilisation de l’API, le statut on/off des sources a été modifié
+ds.state.importChangeEnableStateDs=Lors de l’importation, le statut on/off des sources de données a été modifié
 ds.state.scryptChangeEnable=Le script a changé le statut on/off des sources de données
-ds.state.userCpChangeEnableStateDs=L'utilisateur a copié les sources de données. Les sources de données sont désactivées par défaut
+ds.state.userCpChangeEnableStateDs=L’utilisateur a copié les sources de données. Les sources de données sont désactivées par défaut
 dsList.statusDescribe=Description du statut
 event.reactivation.sleep=Les sources de données ont été mises en sommeil
 event.ds.describe={1}
@@ -3320,16 +3320,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=Note:
+sql.warning.prefix=Attention:
+views.noViews.prefix=maintenant.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_lu.properties b/test/messages_lu.properties
index 56025f852b..f5f02ce064 100644
--- a/test/messages_lu.properties
+++ b/test/messages_lu.properties
@@ -775,7 +775,7 @@ dsEdit.mbus.vifeLabel=Vifes
 dsEdit.mbus.vifeLabels=Vife Label
 dsEdit.mbus.vifeTypes=Vife Typen
 dsEdit.meta=Meta Datenquell
-dsEdit.meta.delay=Berechnungsverz\u00f6gerung</br>
+dsEdit.meta.delay=Berechnungsverz\u00f6gerung
 dsEdit.meta.desc=Meta Datenquell Konfiguratioun
 dsEdit.meta.event=Aktualis\u00e9ierungsereegnis
 dsEdit.meta.event.context=\u00c4nnerung vun den Agangsvariablen
@@ -1179,8 +1179,8 @@ dsEdit.validate.required=Required value
 dsEdit.viconics=Viconics Wireless Thermostats
 dsEdit.viconics.channel=Channel
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.chipRevisionBr=Chip revision
+dsEdit.viconics.commAddress=Comm address
 dsEdit.viconics.convertCelsius=Convert temperatures to celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Data source is not started
@@ -1189,9 +1189,9 @@ dsEdit.viconics.deviceRemove=Device remove (s)
 dsEdit.viconics.deviceWarning=Device offline timeone (s)
 dsEdit.viconics.devices=Devices
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Channel: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.viconics.networkIdentifyFailure=Network identify failed: {0}
 dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.networkTimeout=Network offline timeout (s)
@@ -1205,9 +1205,9 @@ dsEdit.viconics.timeout=Message timeout
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Virtuell Datenquell
 dsEdit.virtual.attractionPoint=Datenpunkt Attraktor
 dsEdit.virtual.change=\u00c4nnerung
@@ -1273,17 +1273,17 @@ dsedit.opc.tagName=Tag Tag
 emport.added=added
 emport.causedBy=caused by:
 emport.compoundEvent.prefix=Compound event detector ''{0}'': {1}
-emport.compoundEvent.xid=A compound event detector does not have an 'xid' value. Ignored.
+emport.compoundEvent.xid=A compound event detector does not have an ’xid’ value. Ignored.
 emport.confirmImport=Warn: the current database will be erased! Are you sure you want to import a new project?
 emport.data=Daten
 emport.dataPoint.badReference=Data point with XID ''{0}'' does not already exist and references a data source that does not exist. Ignored.
 emport.dataPoint.prefix=Data point ''{0}'': {1}
-emport.dataPoint.xid=A data point with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.dataPoint.xid=A data point with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.dataPoints=Datenpunkten
-emport.dataSource.invalidType=Data source with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
-emport.dataSource.missingType=Data source with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.dataSource.invalidType=Data source with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
+emport.dataSource.missingType=Data source with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.dataSource.prefix=Datenquell ''{0}'' : {1}
-emport.dataSource.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.dataSource.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.error.alarmLevel=Invalid alarm level ''{0}'' for event ''{1}''. Valid values are {2}
 emport.error.attractor.missingPoint=Data point with ''{0}'' XID ''{1}'' not found
 emport.error.chart.invalid=Chart renderer has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
@@ -1291,7 +1291,7 @@ emport.error.chart.missing=Chart renderer must have a ''{0}''. Valid values are
 emport.error.component.imageChart.invalid=Image chart component has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
 emport.error.component.imageChart.missing=Image chart component must have a ''{0}''. Valid values are {1}
 emport.error.component.imageIndex=Image index {0} is too high for image set ''{1}''. Valid values are 0 to {2}
-emport.error.component.incompatibleDataType=Data point with 'XID' ''{0}'' has a data type that is not compatible with view component type ''{1}''
+emport.error.component.incompatibleDataType=Data point with ’XID’ ''{0}'' has a data type that is not compatible with view component type ''{1}''
 emport.error.component.invalid=View component has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
 emport.error.component.missing=View component must have a ''{0}''. Valid values are {1}
 emport.error.component.unknownDynamicImage=Dynamic image id ''{0}'' not found. Known dynamic image ids are {1}
@@ -1330,7 +1330,7 @@ emport.error.text.missing=Text renderer must have a ''{0}''. Valid values are {1
 emport.error.viewShare.missing=Missing ''{0}'' in view share
 emport.errorMessage=Errors:
 emport.eventHandler.prefix=Point link ''{0}'': {1}
-emport.eventHandler.xid=A point link does not have an 'xid' value. Ignored.
+emport.eventHandler.xid=A point link does not have an ’xid’ value. Ignored.
 emport.export=Export
 emport.exportDate=Export date
 emport.exportJson=Generate JSON
@@ -1353,29 +1353,29 @@ emport.importProjectTitle=Import Project (Upload)
 emport.includePointValues=Include point values
 emport.indent=Ar\u00e9ckung
 emport.invalidFile=File reading failed ({0})
-emport.invalidImportData=Fir ze import\u00e9ierend Daten sinn ong\u00fclteg: keen <a href="www.json.org">JSON</a> objet.
+emport.invalidImportData=Fir ze import\u00e9ierend Daten sinn ong\u00fclteg: keen JSON objet. (www.json.org)
 emport.invalidProjectName=Invalid name
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
-emport.mailingList.xid=A mailing list does not have an 'xid' value. Ignored.
+emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
 emport.maintenanceEvent.prefix=Maintenance event ''{0}'': {1}
-emport.maintenanceEvent.xid=A maintenance event does not have an 'xid' value. Ignored.
+emport.maintenanceEvent.xid=A maintenance event does not have an ’xid’ value. Ignored.
 emport.noMessages=No result message. Nothing to import?
 emport.parseError=JSON-Parser Fehler: {0}
 emport.pointHierarchy.prefix=Datenpunkthierarchie: {0}
 emport.pointLink.prefix=Point link ''{0}'': {1}
-emport.pointLink.xid=A point link does not have an 'xid' value. Ignored.
+emport.pointLink.xid=A point link does not have an ’xid’ value. Ignored.
 emport.pointValue.missingPoint=Point value ''{0}'': Data point not found
 emport.pointValues=Point values
 emport.pointValuesMax= Max point values
 emport.projectDescription=Description
 emport.projectName=Project name
-emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
-emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
+emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.publisher.prefix=Publisher ''{0}'': {1}
-emport.publisher.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.publisher.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.saved=gesp\u00e4ichert
 emport.scheduledEvent.prefix=Scheduled event ''{0}'': {1}
-emport.scheduledEvent.xid=A scheduled event does not have an 'xid' value. Ignored.
+emport.scheduledEvent.xid=A scheduled event does not have an ’xid’ value. Ignored.
 emport.script.prefix=Script ''{0}'': {1}
 emport.select=Mark\u00e9iert, wat Dir export\u00e9ieren w\u00ebllt
 emport.selectAll=alles mark\u00e9ieren
@@ -1386,14 +1386,14 @@ emport.unselectAll=all Mark\u00e9ierungen l\u00f6schen
 emport.uploadError=Upload failed ({0})
 emport.uploadsFolder=Include Uploads folder
 emport.user.prefix=Benotzer ''{0} : {1}
-emport.user.username=A user does not have a 'username' value. Ignored.
+emport.user.username=A user does not have a ’username’ value. Ignored.
 emport.userPermission.prefix=Recte fir Benotzer ''{0}'' : {1}
-emport.versionError=The project version ({0}) isn't compatible with current system version ({1})
-emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.versionError=The project version ({0}) isn’t compatible with current system version ({1})
+emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 emport.view.prefix=Prozessbild ''{0}'' : {1}
-emport.view.xid=A graphical view does not have an 'xid' value. Ignored.
+emport.view.xid=A graphical view does not have an ’xid’ value. Ignored.
 emport.watchList.prefix=Watch list ''{0}'': {1}
-emport.watchList.xid=A watch list does not have an 'xid' value. Ignored.
+emport.watchList.xid=A watch list does not have an ’xid’ value. Ignored.
 engUnit.0=square meters
 engUnit.1=square feet
 engUnit.10=megavolt amperes
@@ -1586,8 +1586,8 @@ engUnit.98=percent
 engUnit.99=percent per second
 engUnit.190=kilometers
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavolt amperes
 engUnit.abbr.100=per minute
 engUnit.abbr.101=per second
@@ -1808,7 +1808,7 @@ event.alarmMaxDecreased=H\u00e9chsten Alarmpriorit\u00e9it huet sech vun {0} op
 event.alarmMaxIncreased=H\u00e9chsten Alarmpriorit\u00e9it huet sech vun {0} op {1} erh\u00e9icht
 event.audit.added=Benotzer "{0}" huet {1} mat id {2}: {3} erzeugt
 event.audit.changed=Benotzer "{0}" huet {1} mat id {2}: {3} ge\u00e4nnert
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" zu "{2}"
+event.audit.changedProperty={0}: "{1}" zu "{2}"
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Datenpunkt
 event.audit.dataSource=Datenquell
@@ -1817,7 +1817,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2072,8 +2072,8 @@ event.valueParse.generalParsePoint={0}, result={1}, point={2}
 event.valueParse.noData=No data to match against for point {0}
 event.valueParse.noTime=No time match made {0}
 event.valueParse.noValue=No value match made for point {0}
-event.valueParse.numericParse=Couldn't parse to numeric, result={0}
-event.valueParse.numericParsePoint=Couldn't parse to numeric, result={0}, point={1}
+event.valueParse.numericParse=Couldn’t parse to numeric, result={0}
+event.valueParse.numericParsePoint=Couldn’t parse to numeric, result={0}, point={1}
 event.valueParse.textParse=Value did not match any multistate text and was not parsable, result={0}
 event.valueParse.textParsePoint=Value did not match any multistate text and was not parsable, result={0}, point={1}
 event.valueParse.timeParse=Failed to parse time "{0}"
@@ -2112,7 +2112,7 @@ eventHandlers.inactiveNotif=Benoriichtegung gaang
 eventHandlers.inactiveOverride=Override inactive recipients
 eventHandlers.inactiveRecipients=Inactive recipients
 eventHandlers.inactiveScript=When inactive script 
-eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler's inactive list
+eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler’s inactive list
 eventHandlers.invalidActiveSource=Invalid active source point
 eventHandlers.invalidActiveSourceType=Invalid active source point data type
 eventHandlers.invalidActiveValue=Invalid active value to set
@@ -2122,14 +2122,14 @@ eventHandlers.invalidInactiveSourceType=Invalid inactive source point data type
 eventHandlers.invalidInactiveValue=Invalid inactive value to set
 eventHandlers.invalidScripts=Selecione ao menos um script
 eventHandlers.maintenanceEvents=Maintenance events
-eventHandlers.noEmailRecips=Keen Email Empf\u00e4nger!<br>Dir musst mindestens een Email Empf\u00e4nger b\u00e4if\u00fcgen
-eventHandlers.noEscalRecips=Keng Eskalatiouns Email Empf\u00e4nger!<br>Dir musst mindestens een Eskalatiouns Email Empf\u00e4nger b\u00e4if\u00fcgen
+eventHandlers.noEmailRecips=Keen Email Empf\u00e4nger! Dir musst mindestens een Email Empf\u00e4nger b\u00e4if\u00fcgen
+eventHandlers.noEscalRecips=Keng Eskalatiouns Email Empf\u00e4nger! Dir musst mindestens een Eskalatiouns Email Empf\u00e4nger b\u00e4if\u00fcgen
 eventHandlers.noInactiveRecips=You must add inactive recipients
 eventHandlers.noSetPointAction=No set point action has been defined
 eventHandlers.noTargetPoint=No target point selected. You may not have any settable points defined.
 eventHandlers.pointEventDetector=Datenpunktereegnisser
 eventHandlers.publisherEvents=Ereegnisser Ver\u00f6ffentlechung
-eventHandlers.recipTestEmailMessage=This message was sent as a test of an event handler's email recipient list
+eventHandlers.recipTestEmailMessage=This message was sent as a test of an event handler’s email recipient list
 eventHandlers.recipientType.active=Active
 eventHandlers.recipientType.escalation=Escalation
 eventHandlers.recipientType.inactive=Inactive
@@ -2348,7 +2348,7 @@ login.nag=Hiweis: et ass m\u00e9iglech dat Dir Problemer mat ScadaLTS hutt, well
 login.password=Passwuert
 login.supportedBrowser=D\u00ebse Browser g\u00ebtt \u00ebnnerst\u00ebtzt
 login.unknownBrowser=Onbekannte Browser
-login.unsupportedBrowser=D\u00ebse Browser g\u00ebtt offiziell net vun Serotonin Software \u00ebnnerst\u00ebtzt. Mir empfielen <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, oder  Internet Explorer 7.
+login.unsupportedBrowser=D\u00ebse Browser g\u00ebtt offiziell net vun Serotonin Software \u00ebnnerst\u00ebtzt. Mir empfielen Mozilla Firefox, Google Chrome.
 login.userId=Benotzernumm
 login.validation.accountDisabled=\u00c4ren Account gouf gespaart, wennt Iech w.e.g un \u00c4ren Administrator
 login.validation.invalidLogin=Login gescheitert, bitte prob\u00e9iert et nach eng K\u00e9ier
@@ -2421,7 +2421,7 @@ notes.timeByUsername=Z\u00e4itstempel an Benotzer
 notes.userNotes=Bemierkungen
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pagination.ascending=Opsteigend
 pagination.descending=Ofsteigend
 pagination.next=N\u00e4chst(en)
@@ -2466,7 +2466,7 @@ pointDetails.username=Benotzernumm
 pointDetails.views=Usichten
 pointEdit.buttons.disable=Ausschalten
 pointEdit.buttons.enable=Aschalten
-pointEdit.buttons.note=<span class="smallTitle">Hinweis:</span> sp\u00e4icheren, deaktiv\u00e9ieren oder nei starten setzen all aktiven Ereegnisse zer\u00e9ck.
+pointEdit.buttons.note=sp\u00e4icheren, deaktiv\u00e9ieren oder nei starten setzen all aktiven Ereegnisse zer\u00e9ck.
 pointEdit.buttons.restart=Neistart
 pointEdit.chart.includeSum=Zomm berechnen
 pointEdit.chart.invalidLimit=Tabell: Unzuel muss zw\u00ebschen 2 an 50 leien
@@ -2615,7 +2615,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.areYouSureToMoveElement=Are you sure to move element?
 pointHierarchySLTS.movedElement=Moved element
@@ -2777,7 +2777,7 @@ reports.pointComments=Point comments
 reports.pointComments.empty=No point comments to list
 reports.pointName=Numm
 reports.previous=Vorherige(r)
-reports.recipTestEmailMessage=This message was sent as a test of a report's email recipient list
+reports.recipTestEmailMessage=This message was sent as a test of a report’s email recipient list
 reports.relative=Relativ zur Erstellungsz\u00e4it
 reports.rendered=Erstellt
 reports.report=Report
@@ -2856,7 +2856,7 @@ sql.query=SQL-Offro starten
 sql.rowsUpdated=Datens\u00e4tz aktualis\u00e9iert
 sql.sql=SQL
 sql.update=SQL-Update ausf\u00e9ieren
-sql.warning=<span class="formError">Achtung:</span> Benotzt d&rsquo;SQL Offro mat Virsiicht. Benotzerfehler kennen zu Datenverloscht an/oder Fehlfunktiounen vum System f\u00e9ieren..
+sql.warning=Benotzt d'SQL Offro mat Virsiicht. Benotzerfehler kennen zu Datenverloscht an/oder Fehlfunktiounen vum System f\u00e9ieren.
 systemSettings.auditAlarmLevels=Audit event alarm levels
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.auth=Server erfuerdert Legitimatioun
@@ -3058,7 +3058,7 @@ viewEdit.compound.type.static=Static
 viewEdit.compound.width=Breet
 viewEdit.deletePointView=Delete point component
 viewEdit.deleteStaticView=Delete static content
-viewEdit.deleteView=Remove yourself from the view's share list
+viewEdit.deleteView=Remove yourself from the view’s share list
 viewEdit.editGraphicalRenderer=Beaarbecht Duerstellung
 viewEdit.editPointView=Beaarbecht Datenpunkt vum Bausteen
 viewEdit.editStaticView=Edit static content
@@ -3129,7 +3129,7 @@ viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Size
 views.newView=Nei Prozessusicht
-views.noViews=Dir hutt nach kee Prozessbild. Erstellt een <a href="view_edit.shtm">jetzt</a> .
+views.noViews=Dir hutt nach kee Prozessbild. Erstellt een 
 views.title=Prozessbild
 watchlist.addNewList=Nei Beobachtungslescht
 watchlist.addToWatchlist=Zur Beobachtungslescht b\u00e4if\u00fcgen
@@ -3339,16 +3339,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=Hinweis:
+sql.warning.prefix=Warnung:
+views.noViews.prefix=elo.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_nl.properties b/test/messages_nl.properties
index cc838b5d15..ca24e2b770 100644
--- a/test/messages_nl.properties
+++ b/test/messages_nl.properties
@@ -665,7 +665,7 @@ dsEdit.meta.event.week=Start van week
 dsEdit.meta.event.month=Start van maand
 dsEdit.meta.event.year=Start van jaar
 dsEdit.meta.event.cron=Cron patroon
-dsEdit.meta.delay=Uitvoering vertraging<br/>
+dsEdit.meta.delay=Uitvoering vertraging 
 dsEdit.meta.test.success=Succes. resultaat={0}
 dsEdit.meta.test.successTs=Success. resultaat={0}, tijdstempel={1}
 dsEdit.meta.test.context=Een of meer punten zijn uitgeschakeld of missen
@@ -947,16 +947,16 @@ dsEdit.viconics.networkInfo=Netwerk informatie
 dsEdit.viconics.refreshing=Verversen...
 dsEdit.viconics.rfModule=RF Module
 dsEdit.viconics.devices=Devices
-dsEdit.viconics.commAddress=Comm<br/>adres
-dsEdit.viconics.modelNumber=Model<br/>nummer
-dsEdit.viconics.firmwareRevision=Firmware<br/>revisie
+dsEdit.viconics.commAddress=Comm adres
+dsEdit.viconics.modelNumber=Model nummer
+dsEdit.viconics.firmwareRevision=Firmware revisie
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revisie
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revisie
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revisie
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee netwerk adres
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>netwerk<br/>adres
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee netwerk adres
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=Chip revisie
-dsEdit.viconics.chipRevisionBr=Chip<br/>revisie
+dsEdit.viconics.chipRevisionBr=Chip revisie
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 
@@ -1075,38 +1075,38 @@ emport.importProgress=Bezig met importeren...
 emport.importCancelled=Import afgebroken
 emport.importComplete=Import gereed
 emport.noMessages=Geen resultaat bericht. Niets te importeren ?
-emport.invalidImportData=Import data is ongeldig: geen JSON object
+emport.invalidImportData=Import data is ongeldig: geen JSON object. (www.json.org)
 emport.parseError=JSON parse fout: {0}
-emport.user.username=Een gebruiker heeft geen 'gebruiker' waarde. Genegeerd.
+emport.user.username=Een gebruiker heeft geen ’gebruiker’ waarde. Genegeerd.
 emport.user.prefix=Gebruiker ''{0}'': {1}
-emport.view.missingType=View met XID ''{0}'' bestaat nog niet en heeft geen 'type' waarde. Geldige typen zijn {1}
-emport.dataSource.xid=Een gegevensbron met naam ''{0}'' heeft geen 'xid' waarde. Genegeerd.
-emport.dataSource.missingType=gegevensbron met XID ''{0}'' bestaat nog niet en heeft geen 'type' waarde. Geldige typen zijn {1}
-emport.dataSource.invalidType="gegevensbron met XID ''{0}''  bestaat nog niet en heeft een ongeldige 'type' waarde van ''{1}''. Geldige typen zijn {2}
+emport.view.missingType=View met XID ''{0}'' bestaat nog niet en heeft geen ’type’ waarde. Geldige typen zijn {1}
+emport.dataSource.xid=Een gegevensbron met naam ''{0}'' heeft geen ’xid’ waarde. Genegeerd.
+emport.dataSource.missingType=gegevensbron met XID ''{0}'' bestaat nog niet en heeft geen ’type’ waarde. Geldige typen zijn {1}
+emport.dataSource.invalidType="gegevensbron met XID ''{0}''  bestaat nog niet en heeft een ongeldige ’type’ waarde van ''{1}''. Geldige typen zijn {2}
 emport.dataSource.prefix=gegevensbron ''{0}'': {1}
-emport.dataPoint.xid=A data punt met naam ''{0}'' heeft geen 'xid' waarde. Genegeerd.
+emport.dataPoint.xid=A data punt met naam ''{0}'' heeft geen ’xid’ waarde. Genegeerd.
 emport.dataPoint.badReference=Data punt met XID ''{0}'' bestaat nog niet en refereert naar een gegevensbron die nog niet bestaat. Genegeerd.
 emport.dataPoint.prefix=Data punt ''{0}'': {1}
 emport.userPermission.prefix=Rechten voor gebruiker ''{0}'': {1}
 emport.added=toegevoegd
 emport.saved=opgeslagen
 emport.causedBy=veroorzaakt door:
-emport.view.xid=Een grafische view heeft geen 'xid' waarde. Genegeerd.
+emport.view.xid=Een grafische view heeft geen ’xid’ waarde. Genegeerd.
 emport.view.prefix=View ''{0}'': {1}
 emport.pointHierarchy.prefix=Punt hi&euml;rarchie: {0}
-emport.pointLink.xid=Een punt link heeft geen 'xid' waarde. Genegeerd.
+emport.pointLink.xid=Een punt link heeft geen ’xid’ waarde. Genegeerd.
 emport.pointLink.prefix=Punt link ''{0}'': {1}
-emport.scheduledEvent.xid=Een geplande gebeurtenis heeft geen 'xid' waarde. Genegeerd.
+emport.scheduledEvent.xid=Een geplande gebeurtenis heeft geen ’xid’ waarde. Genegeerd.
 emport.scheduledEvent.prefix=Geplande gebeurtenis ''{0}'': {1}
-emport.compoundEvent.xid=Een samengestelde gebeurtenis detector heeft geen 'xid' waarde. Genegeerd.
+emport.compoundEvent.xid=Een samengestelde gebeurtenis detector heeft geen ’xid’ waarde. Genegeerd.
 emport.compoundEvent.prefix=Samengestelde gebeurtenis detector ''{0}'': {1}
-emport.mailingList.xid=Een mailing lijst heeft geen 'xid' waarde. Genegeerd.
+emport.mailingList.xid=Een mailing lijst heeft geen ’xid’ waarde. Genegeerd.
 emport.mailingList.prefix=Mailing lijst ''{0}'': {1}
-emport.eventHandler.xid=Een punt link heeft geen 'xid' waarde. Genegeerd.
+emport.eventHandler.xid=Een punt link heeft geen ’xid’ waarde. Genegeerd.
 emport.eventHandler.prefix=Punt link ''{0}'': {1}
-emport.publisher.xid=Een data bron met naam ''{0}'' heeft geen 'xid' waarde. 'xid' value. Genegeerd.
-emport.publisher.missingType=Publisher met XID ''{0}'' bestaat nog niet en heeft geen 'type' waarde. Geldige types zijn {1}
-emport.publisher.invalidType=Publisher met XID ''{0}'' bestaat nog niet en heeft geen geldige 'type' waarde. 'type' waarde van ''{1}''. Geldige types zijn {2}
+emport.publisher.xid=Een data bron met naam ''{0}'' heeft geen ’xid’ waarde. ’xid’ value. Genegeerd.
+emport.publisher.missingType=Publisher met XID ''{0}'' bestaat nog niet en heeft geen ’type’ waarde. Geldige types zijn {1}
+emport.publisher.invalidType=Publisher met XID ''{0}'' bestaat nog niet en heeft geen geldige ’type’ waarde. ’type’ waarde van ''{1}''. Geldige types zijn {2}
 emport.publisher.prefix=Publisher ''{0}'': {1}
 
 eventHandlers.recipTestEmailMessage=Dit bericht was verzonden om een email ontangstlijst van een gebeurtenis afhandelaar te testen
@@ -1228,8 +1228,7 @@ login.loginButton=Inloggen
 login.unknownBrowser=Bezig met controleren browser voor compatibiliteit...
 login.supportedBrowser=Deze browser is ondersteund.
 login.unsupportedBrowser=Het kan zijn dat uw browser wel werkt met dit product, maar het is niet officieel ondersteund door Serotonin \
-Software. Wij adviseren het gebruik van <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, of \
-Internet Explorer 7.
+Software. Wij adviseren het gebruik van Mozilla Firefox, Google Chrome.
 login.nag=NB: Het kan zijn dat u problemen ondervindt met ScadaLTS omdat uw browser niet officieel is ondersteund. Upgrade uw browser s.v.p.  
 
 mailingLists.added=Mailing lijst toegevoegd
@@ -1261,7 +1260,7 @@ notes.cancel=Afbreken
 notes.timeByUsername=tijd door gebruikersnaam
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pointDetails.recordCountError=Record teller moet een getal zijn
 pointDetails.timePeriodError=Tijd periode moet een getal zijn
 pointDetails.imageCountError=Afbeelding teller moet een getal zijn
@@ -1297,7 +1296,7 @@ pointDetails.accessType=Toegangstype
 pointEdit.buttons.enable=Inschakelen
 pointEdit.buttons.disable=Uitschakelen
 pointEdit.buttons.restart=Herstart
-pointEdit.buttons.note=<span class="smallTitle">Noot:</span> opslaan, uitschakelen, of herstarten van een punt heeft tot gevolg dat alle actieve gebeurtenissen terugkeren naar normaal.
+pointEdit.buttons.note=opslaan, uitschakelen, of herstarten van een punt heeft tot gevolg dat alle actieve gebeurtenissen terugkeren naar normaal.
 
 pointEdit.chart.props=Grafiek generator eigenschappen
 pointEdit.chart.type=Type
@@ -1450,7 +1449,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.areYouSureToMoveElement=Are you sure to move element?
 pointHierarchySLTS.movedElement=Moved element
@@ -1647,7 +1646,7 @@ scheduledEvents.validate.inactiveTrigger=Fout bij aanmaken inactieve trigger: {0
 scheduledEvents.validate.aliasTooLong=Alias kan niet langer zijn dan 50 karakters
 scheduledEvents.validate.invalidRtn=Inactief tijd moet na actief tijd komen
 
-sql.warning=<span class="formError">Waarschuwing:</span> gebruik deze faciliteit op eigen risico. Incorrect gebruik kan leiden tot beschadigde data en/of systeem storing.
+sql.warning=gebruik deze faciliteit op eigen risico. Incorrect gebruik kan leiden tot beschadigde data en/of systeem storing.
 sql.sql=SQL
 sql.query=Invoeren query
 sql.update=Invoeren update
@@ -1665,8 +1664,8 @@ systemSettings.upToDate=Deze instantie van Mango is up to date
 systemSettings.emailSettings=Email instellingen
 systemSettings.smtpHost=SMTP host
 systemSettings.smtpPort=SMTP poort
-systemSettings.fromAddress='Van' adres
-systemSettings.fromName='Van' naam
+systemSettings.fromAddress=’Van’ adres
+systemSettings.fromName=’Van’ naam
 systemSettings.auth=Gebruik autorisatie
 systemSettings.smtpUsername=Gebruikersnaam
 systemSettings.smtpPassword=Wachtwoord
@@ -1816,7 +1815,7 @@ viewEdit.compound.duration=Duur
 
 views.title=Grafische views
 views.newView=Nieuwe view
-views.noViews=Er zijn nog geen grafische views aangemaakt. Maak er <a href="view_edit.shtm">nu</a> een aan.
+views.noViews=Er zijn nog geen grafische views aangemaakt. Maak er 
 
 viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
@@ -1918,7 +1917,7 @@ event.system.process=Proces gebeurtenis handler gefaald
 
 event.audit.added=User "{0}" aangemaakt {1} met id {2}: {3}
 event.audit.changed=User "{0}" veranderd {1} met id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty={0}: "{1}" to "{2}"
 event.audit.compoundEventDetector=Samengestelde gebeurtenis detector
 event.audit.dataPoint=Data punt
 event.audit.dataSource=Data bron
@@ -1927,7 +1926,7 @@ event.audit.eventHandler=Gebeurtenis handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Punt gebeurtenis detector
 event.audit.pointLink=Punt link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2267,7 +2266,7 @@ emport.error.eventCode=Ongeldige gebeurtenis code ''{0}''. Geldig codes zijn {1}
 emport.error.alarmLevel=Ongeldig alarm niveau ''{0}'' voor gebeurtenis ''{1}''. Geldige waarden zijn {2}
 emport.error.missingUser=Gebruiker met gebruikersnaam ''{0}'' niet gevonden
 emport.error.viewShare.missing=Ontbrekende ''{0}'' in gedeelde view
-emport.error.component.incompatibleDataType=Data punt met 'XID' ''{0}'' heeft een data type die niet compatibel is met view component type ''{1}''
+emport.error.component.incompatibleDataType=Data punt met ’XID’ ''{0}'' heeft een data type die niet compatibel is met view component type ''{1}''
 emport.error.compound.invalidChildId=Ongeldig child id ''{0}'' voor samengestelde view component van type ''{1}''. Geldige ids zijn {2}
 emport.error.component.unknownDynamicImage=Dynamische afbeelding id ''{0}'' niet gevonden. Bekende dynamische afbeelding ids zijn {1}
 emport.error.component.unknownImageSet=Afbeelding set id ''{0}'' niet gevonden. Bekende afbeelding set ids zijn {1}
@@ -2482,8 +2481,8 @@ engUnit.188=newton per meter
 engUnit.189=watt per meter per graden kelvin
 engUnit.190=kilometers
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.2=mA
 engUnit.abbr.3=A
 engUnit.abbr.4=ohms
@@ -2889,7 +2888,7 @@ emport.exportProjectInstruction=Select your options and download the project fil
 pointEdit.props.chartColour=Chart color
 eventHandlers.activeScript=When active script
 dox.drStorageHt5bDS=Data Source Dr.StorageHT-5B
-eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler's inactive list
+eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler’s inactive list
 dox.colours=Color
 emport.projectName=Project name
 dsEdit.fhz4j.deviceHousecode=Device Housecode
@@ -2961,7 +2960,7 @@ dsEdit.jmx.writeFailed=Write failed for ''{0}''
 viewEdit.graphic.views=Views
 dsEdit.asciiSerial.desc=ASCII Serial Properties
 graphic.enhancedImageChart.seriesConfig.seriesOptions.strokeWidth=Stroke width\:
-emport.watchList.xid=A watch list does not have an 'xid' value. Ignored.
+emport.watchList.xid=A watch list does not have an ’xid’ value. Ignored.
 reports.zipData=Data in .zip format
 events.silenceAll=Silence all
 viewEdit.graphic.whenOffLabel=Label when OFF (0, false)
@@ -2969,7 +2968,7 @@ viewEdit.graphic.text=Text
 script.dpCommands=Datapoints commands
 dsEdit.asciiSerial.stopMode=Stop mode
 dsEdit.nodaves7.writeBaseCmd=Write command line
-emport.versionError=The project version ({0}) isn't compatible with current system version ({1})
+emport.versionError=The project version ({0}) is’ compatible with current system version ({1})
 events.export.ackedByDeletedUser=(user deleted)
 dsEdit.jmx.attributeName=Attribute name
 dsEdit.opc.tagName=Tag Name
@@ -3183,7 +3182,7 @@ publisherEdit.persistent.status.connecting=Connected point {0} of {1}
 emport.systemSettingsFailed=System configuration export error
 dsEdit.serial.inputBufferSize=Input Buffer Size
 viewEdit.compound.type.static=Static
-emport.maintenanceEvent.xid=A maintenance event does not have an 'xid' value. Ignored.
+emport.maintenanceEvent.xid=A maintenance event does not have an ’xid’ value. Ignored.
 dsEdit.modbusIp.socketPointName=TCP socket monitoring
 scripts.seDetails=Script details
 watchlist.consolidatedChart=Include in consolidated chart
@@ -3442,16 +3441,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=Noot:
+sql.warning.prefix=Waarschuwing:
+views.noViews.prefix=nu een aan.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_pl.properties b/test/messages_pl.properties
index aef65b4b72..027b4183b4 100644
--- a/test/messages_pl.properties
+++ b/test/messages_pl.properties
@@ -195,7 +195,7 @@ js.help.error=B\u0142\u0105d
 js.help.related=Powi\u0105zane przedmioty
 js.help.lastUpdated=Ostatnio zaktualizowany
 js.email.noRecipients=Brak odbiorc\u00f3w
-js.email.addMailingList=Dodaj list\u0119 mail'ingow\u0105
+js.email.addMailingList=Dodaj list\u0119 mail’ingow\u0105
 js.email.addUser=Dodaj u\u017cytkownika
 js.email.addAddress=Dodaj adres
 js.email.noRecipForEmail=Brak odbiorc\u00f3w do wys\u0142ania testowego e-maila
@@ -679,7 +679,7 @@ dsEdit.meta.event.week=Start of week
 dsEdit.meta.event.month=Start of month
 dsEdit.meta.event.year=Start of year
 dsEdit.meta.event.cron=Cron pattern
-dsEdit.meta.delay=Execution delay<br/>
+dsEdit.meta.delay=Execution delay
 dsEdit.meta.test.success=Success. result={0}
 dsEdit.meta.test.successTs=Success. result={0}, timestamp={1}
 dsEdit.meta.test.context=One or more points are disabled or missing
@@ -761,7 +761,7 @@ dsEdit.modbusIp.transportType.udp=UDP
 dsEdit.modbusIp.host=Host
 dsEdit.modbusIp.port=Port
 dsEdit.modbusIp.encapsulated=Encapsulated
-dsEdit.modbusIp.createSocketMonitorPoint=Stw\u00f3rz punkt monitorowania socket'u
+dsEdit.modbusIp.createSocketMonitorPoint=Stw\u00f3rz punkt monitorowania socket’u
 
 dsEdit.modbusSerial=Modbus Serial
 dsEdit.modbusSerial.port=Port
@@ -983,16 +983,16 @@ dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.refreshing=Refreshing...
 dsEdit.viconics.rfModule=RF Module
 dsEdit.viconics.devices=Devices
-dsEdit.viconics.commAddress=Comm<br/>address
-dsEdit.viconics.modelNumber=Model<br/>number
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.commAddress=Comm address
+dsEdit.viconics.modelNumber=Model number
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
+dsEdit.viconics.chipRevisionBr=Chip revision
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
@@ -1135,49 +1135,49 @@ emport.importProgress=Import in progress...
 emport.importCancelled=Import cancelled
 emport.importComplete=Import complete
 emport.noMessages=No result message. Nothing to import?
-emport.invalidImportData=Import data is invalid: not a JSON object
+emport.invalidImportData=Import data is invalid: not a JSON object. (www.json.org)
 emport.parseError=JSON parse error: {0}
-emport.user.username=A user does not have a 'username' value. Ignored.
+emport.user.username=A user does not have a ’username’ value. Ignored.
 emport.user.prefix=User ''{0}'': {1}
-emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
-emport.dataSource.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
-emport.dataSource.missingType=Data source with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
-emport.dataSource.invalidType=Data source with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
+emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
+emport.dataSource.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
+emport.dataSource.missingType=Data source with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
+emport.dataSource.invalidType=Data source with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
 emport.dataSource.prefix=Data source ''{0}'': {1}
-emport.dataPoint.xid=A data point with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.dataPoint.xid=A data point with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.dataPoint.badReference=Data point with XID ''{0}'' does not already exist and references a data source that does not exist. Ignored.
 emport.dataPoint.prefix=Data point ''{0}'': {1}
 emport.userPermission.prefix=Permissions for user ''{0}'': {1}
 emport.added=dodano
 emport.saved=zapisano
 emport.causedBy=przez:
-emport.view.xid=A graphical view does not have an 'xid' value. Ignored.
+emport.view.xid=A graphical view does not have an ’xid’ value. Ignored.
 emport.view.prefix=View ''{0}'': {1}
 emport.pointHierarchy.prefix=Point hierarchy: {0}
-emport.pointLink.xid=A point link does not have an 'xid' value. Ignored.
+emport.pointLink.xid=A point link does not have an ’xid’ value. Ignored.
 emport.pointLink.prefix=Point link ''{0}'': {1}
-emport.scheduledEvent.xid=A scheduled event does not have an 'xid' value. Ignored.
+emport.scheduledEvent.xid=A scheduled event does not have an ’xid’ value. Ignored.
 emport.scheduledEvent.prefix=Scheduled event ''{0}'': {1}
-emport.compoundEvent.xid=A compound event detector does not have an 'xid' value. Ignored.
+emport.compoundEvent.xid=A compound event detector does not have an ’xid’ value. Ignored.
 emport.compoundEvent.prefix=Compound event detector ''{0}'': {1}
-emport.mailingList.xid=A mailing list does not have an 'xid' value. Ignored.
+emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
-emport.eventHandler.xid=A point link does not have an 'xid' value. Ignored.
+emport.eventHandler.xid=A point link does not have an ’xid’ value. Ignored.
 emport.eventHandler.prefix=Point link ''{0}'': {1}
-emport.publisher.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
-emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
-emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
+emport.publisher.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
+emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
+emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
 emport.publisher.prefix=Publisher ''{0}'': {1}
-emport.watchList.xid=A watch list does not have an 'xid' value. Ignored.
+emport.watchList.xid=A watch list does not have an ’xid’ value. Ignored.
 emport.watchList.prefix=Watch list ''{0}'': {1}
-emport.maintenanceEvent.xid=A maintenance event does not have an 'xid' value. Ignored.
+emport.maintenanceEvent.xid=A maintenance event does not have an ’xid’ value. Ignored.
 emport.maintenanceEvent.prefix=Maintenance event ''{0}'': {1}
 
-eventHandlers.recipTestEmailMessage=This message was sent as a test of an event handler's email recipient list
+eventHandlers.recipTestEmailMessage=This message was sent as a test of an event handler’s email recipient list
 eventHandlers.emailRecipients=Email recipients
-eventHandlers.escalTestEmailMessage=This message was sent as a test of an event handler's escalation list
+eventHandlers.escalTestEmailMessage=This message was sent as a test of an event handler’s escalation list
 eventHandlers.escalRecipients=Escalation recipients
-eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler's inactive list
+eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler’s inactive list
 eventHandlers.inactiveRecipients=Inactive recipients
 eventHandlers.noEmailRecips=You must add email recipients
 eventHandlers.escalDelayError=Escalation delay must be greater than zero
@@ -1267,7 +1267,7 @@ events.ackedByMaintenance=- maintanance mode
 
 footer.rightsReserved=Wszystkie prawa zastrze\u017cone.
 
-header.title=ScadaJR
+header.title=Scada-LTS
 header.mute=Wycisz
 header.unmute=Wy\u0142\u0105cz wyciszenie
 header.watchlist=Listy podgl\u0105du punkt\u00f3w
@@ -1309,12 +1309,11 @@ login.validation.accountDisabled=twoje konto zosta\u0142o zablokowane. Skontaktu
 login.loginButton=Zaloguj
 login.unknownBrowser=Kontrola zgodno\u015bci przegl\u0105darki...
 login.supportedBrowser=Ta przegl\u0105darka jest obs\u0142ugiwana.
-login.unsupportedBrowser=Twoja przegl\u0105darka mo\u017ce dzia\u0142a\u0107 poprawnie, ale nie jest oficjalnie wspierana. Rekomendujemy u\u017cywanie <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, lub \
-Internet Explorer 7.
+login.unsupportedBrowser=Twoja przegl\u0105darka mo\u017ce dzia\u0142a\u0107 poprawnie, ale nie jest oficjalnie wspierana. Rekomendujemy u\u017cywanie Mozilla Firefox, Google Chrome.
 login.nag=NOTATKA: mo\u017cesz mie\u0107 problemy poniewa\u017c u\u017cywasz nie wspieranej przegl\u0105darki.  
 
-mailingLists.added=Lista mail'ingowa dodana
-mailingLists.saved=Lista mail'ingowa zapisana
+mailingLists.added=Lista mail’ingowa dodana
+mailingLists.saved=Lista mail’ingowa zapisana
 mailingLists.testEmailMessage=Test email has been sent
 mailingLists.noUser=No user found to add
 mailingLists.noAddress=Enter the email address before adding to the list
@@ -1414,7 +1413,7 @@ pointDetails.accessType=Typ dost\u0119pu
 pointEdit.buttons.enable=Odblokuj
 pointEdit.buttons.disable=Zablokuj
 pointEdit.buttons.restart=Zrestartuj
-pointEdit.buttons.note=<span class="smallTitle">Notatka:</span> saving, disabling, or restarting a point causes all active events to be returned to normal.
+pointEdit.buttons.note=saving, disabling, or restarting a point causes all active events to be returned to normal.
 
 pointEdit.chart.props=Chart renderer properties
 pointEdit.chart.type=Type
@@ -1633,7 +1632,7 @@ publisherList.config=Configuration
 publisherList.status=status
 publisherList.noRows=No rows
 
-reports.recipTestEmailMessage=This message was sent as a test of a report's email recipient list
+reports.recipTestEmailMessage=This message was sent as a test of a report’s email recipient list
 reports.emailRecipients=Email recipients
 reports.export=Export data
 reports.eventExport=Export events
@@ -1732,7 +1731,7 @@ scheduledEvents.validate.inactiveTrigger=Error creating inactive trigger: {0}
 scheduledEvents.validate.aliasTooLong=Alias cannot be longer than 50 characters
 scheduledEvents.validate.invalidRtn=Inactive time must be after active time
 
-sql.warning=<span class="formError">Warning:</span> use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
+sql.warning=use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
 sql.sql=SQL
 sql.query=Submit query
 sql.update=Submit update
@@ -1750,8 +1749,8 @@ systemSettings.upToDate=This instance of Scada-LTS is up to date
 systemSettings.emailSettings=Ustawienia Email
 systemSettings.smtpHost=SMTP host
 systemSettings.smtpPort=SMTP port
-systemSettings.fromAddress='From' address
-systemSettings.fromName='From' name
+systemSettings.fromAddress=’From’ address
+systemSettings.fromName=’From’ name
 systemSettings.auth=Use authorization
 systemSettings.smtpUsername=Username
 systemSettings.smtpPassword=Password
@@ -1764,7 +1763,7 @@ systemSettings.systemAlarmLevels=Poziomy alarmowe zdarze\u0144 systemowych
 systemSettings.auditAlarmLevels=Poziomy alarmowe punkt\u00f3w danych
 systemSettings.otherSettings=Inne ustawienia
 systemSettings.purgeEvents=Usu\u0144 zdarzenia starsze ni\u017c
-systemSettings.purgeReports=PUsu\u0144 raporty starsze ni\u017c
+systemSettings.purgeReports=Usu\u0144 raporty starsze ni\u017c
 systemSettings.uiPerformance=Wydajno\u015b\u0107 interfejsu u\u017cytkownika
 systemSettings.uiPerformance.high=Wysoka
 systemSettings.uiPerformance.med=\u015arednia
@@ -1790,7 +1789,7 @@ systemSettings.purgeNow=Oczy\u015b\u0107 baz\u0119 u\u017cywaj\u0105c ustawie\u0
 systemSettings.filedataSize=Wielko\u015b\u0107 plik\u00f3w
 systemSettings.totalSize=Rozmiar ca\u0142kowity
 systemSettings.historyCount=Ilo\u015b\u0107 historii
-systemSettings.topPoints=Punkty top'owe
+systemSettings.topPoints=Punkty top’owe
 systemSettings.eventCount=Ilo\u015b\u0107 zdarze\u0144
 systemSettings.testEmail=Your system settings test email was successfully sent.
 systemSettings.versionCheck1=Socket timeout during check. Please try again
@@ -1915,7 +1914,7 @@ viewEdit.fullScreen=Pe\u0142ny ekran
 
 views.title=Schematy
 views.newView=Nowy schemat
-views.noViews=Nie masz \u017cadnych schamt\u00f3w.Utw\u00f3rz <a href="view_edit.shtm">teraz</a>.
+views.noViews=Nie masz \u017cadnych schemat\u00f3w. Utw\u00f3rz 
 
 watchlist.addToWatchlist=Dodaj do listy
 watchlist.points=Punkty
@@ -2001,7 +2000,7 @@ event.system.process=B\u0142\u0105d obs\u0142ugi zdarzenia
 
 event.audit.added=User "{0}" created {1} with id {2}: {3}
 event.audit.changed=User "{0}" changed {1} with id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty={0}: "{1}" to "{2}"
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Data point
 event.audit.dataSource=Data source
@@ -2010,7 +2009,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2133,8 +2132,8 @@ event.valueParse.timeParse=Failed to parse time "{0}"
 event.valueParse.timeParsePoint=Failed to parse time "{0}" for {1}
 event.valueParse.textParse=Value did not match any multistate text and was not parsable, result={0}
 event.valueParse.textParsePoint=Value did not match any multistate text and was not parsable, result={0}, point={1}
-event.valueParse.numericParse=Couldn't parse to numeric, result={0}
-event.valueParse.numericParsePoint=Couldn't parse to numeric, result={0}, point={1}
+event.valueParse.numericParse=Couldn’t parse to numeric, result={0}
+event.valueParse.numericParsePoint=Couldn’t parse to numeric, result={0}, point={1}
 event.valueParse.generalParse={0}, result={1}
 event.valueParse.generalParsePoint={0}, result={1}, point={2}
 event.1wire.deviceRead=Error reading device at address {0}: {1}
@@ -2353,7 +2352,7 @@ emport.error.eventCode=Invalid event code ''{0}''. Valid codes are {1}
 emport.error.alarmLevel=Invalid alarm level ''{0}'' for event ''{1}''. Valid values are {2}
 emport.error.missingUser=User with username ''{0}'' not found
 emport.error.viewShare.missing=Missing ''{0}'' in view share
-emport.error.component.incompatibleDataType=Data point with 'XID' ''{0}'' has a data type that is not compatible with view component type ''{1}''
+emport.error.component.incompatibleDataType=Data point with ’XID’ ''{0}'' has a data type that is not compatible with view component type ''{1}''
 emport.error.compound.invalidChildId=Invalid child id ''{0}'' for compound view component of type ''{1}''. Valid ids are {2}
 emport.error.component.unknownDynamicImage=Dynamic image id ''{0}'' not found. Known dynamic image ids are {1}
 emport.error.component.unknownImageSet=Image set id ''{0}'' not found. Known image set ids are {1}
@@ -2569,8 +2568,8 @@ engUnit.188=newtons per meter
 engUnit.189=watts per meter per degree kelvin
 engUnit.190=kilometers
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.2=mA
 engUnit.abbr.3=A
 engUnit.abbr.4=ohms
@@ -3026,7 +3025,7 @@ emport.errorMessage=B\u0142\u0119dy:
 
 emport.uploadError=Upload failed ({0})
 emport.invalidFile=File reading failed ({0})
-emport.versionError=The project version ({0}) isn't compatible with current system version ({1})
+emport.versionError=The project version ({0}) isn’t compatible with current system version ({1})
 
 dox.exportProject=Exporting projects
 dox.importProject=Importing projects
@@ -3092,7 +3091,7 @@ users.theme.dark=Ciemny
 viewEdit.moveDownComponent=Send to back
 viewEdit.moveUpComponent=Bring to front
 emport.profilePermission.prefix=Uprawnienia dla profilu ''{0}'': {1}
-dox.anonymousView=Dost0119p anonimowy
+dox.anonymousView=Dost\u0119p anonimowy
 viewEdit.position.x=Położenie X
 viewEdit.position.y=Położenie Y
 
@@ -3273,7 +3272,7 @@ mport.graphicsFolder=Include Graphics folder
 graphic.enhancedImageChart.seriesConfig=Series configuration
 dsEdit.radiuino.pollingMode=Polling mode
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 publisherEdit.httpSender.point.status=Status
 dsEdit.radiuino.stopBits=Stop Bits
 userProfiles.none=None
@@ -3464,16 +3463,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Notatka:
+sql.warning.prefix=Ostrzeżenie:
+views.noViews.prefix=teraz.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_pt.properties b/test/messages_pt.properties
index 94316ea501..514c8df18f 100644
--- a/test/messages_pt.properties
+++ b/test/messages_pt.properties
@@ -685,7 +685,7 @@ dsEdit.meta.event.week=In\u00edcio da semana
 dsEdit.meta.event.month=In\u00edcio do m\u00eas
 dsEdit.meta.event.year=In\u00edcio do ano
 dsEdit.meta.event.cron=Padr\u00e3o cron
-dsEdit.meta.delay=Atraso de execu\u00e7\u00e3o<br/>
+dsEdit.meta.delay=Atraso de execu\u00e7\u00e3o
 dsEdit.meta.test.success=Successo. resultado={0}
 dsEdit.meta.test.successTs=Successo. resultado={0}, timestamp={1}
 dsEdit.meta.test.context=Um ou mais pontos est\u00e3o desabilitados ou faltando
@@ -993,16 +993,16 @@ dsEdit.viconics.networkInfo=Informa\u00e7\u00e3o da rede
 dsEdit.viconics.refreshing=Atualizando...
 dsEdit.viconics.rfModule=M\u00f3dulo RF
 dsEdit.viconics.devices=Dispositivos
-dsEdit.viconics.commAddress=Endere\u00e7os<br/>Comm
-dsEdit.viconics.modelNumber=N\u00famero de<br/>modelo
-dsEdit.viconics.firmwareRevision=Revis\u00e3o de<br/>Firmware
+dsEdit.viconics.commAddress=Endere\u00e7os Comm
+dsEdit.viconics.modelNumber=N\u00famero de modelo
+dsEdit.viconics.firmwareRevision=Revis\u00e3o de Firmware
 dsEdit.viconics.zigbeeFirmwareRevision=Revis\u00e3o de firmware Zigbee
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Revis\u00e3o de<br/>firmware<br/>Zigbee
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Revis\u00e3o de firmware Zigbee
 dsEdit.viconics.zigbeeNetworkAddress=Endere\u00e7o de rede Zigbee
-dsEdit.viconics.zigbeeNetworkAddressBr=Endere\u00e7o de<br/>rede<br/>Zigbee
+dsEdit.viconics.zigbeeNetworkAddressBr=Endere\u00e7o de rede Zigbee
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=Revis\u00e3o do Chip
-dsEdit.viconics.chipRevisionBr=Revis\u00e3o do<br/>chip
+dsEdit.viconics.chipRevisionBr=Revis\u00e3o do chip
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.unreliable=Valor do ponto pode n\u00e3o ser confi\u00e1vel
@@ -1204,42 +1204,42 @@ emport.importProgress=Importa\u00e7\u00e3o em progresso...
 emport.importCancelled=Importa\u00e7\u00e3o cancelada
 emport.importComplete=Importa\u00e7\u00e3o completa
 emport.noMessages=Mensagem sem resultados. Nada a importar?
-emport.invalidImportData=Dado para importa\u00e7\u00e3o inv\u00e1lido: n\u00e3o \u00e9 um objeto JSON
+emport.invalidImportData=Dado para importa\u00e7\u00e3o inv\u00e1lido: n\u00e3o \u00e9 um objeto JSON. (www.json.org)
 emport.parseError=Erro de an\u00e1lise JSON: {0}
-emport.user.username=Um usu\u00e1rio n\u00e3o tem um valor 'nome de usu\u00e1rio'. Ignorado.
+emport.user.username=Um usu\u00e1rio n\u00e3o tem um valor ’nome de usu\u00e1rio’. Ignorado.
 emport.user.prefix=Usu\u00e1rio ''{0}'': {1}
-emport.view.missingType=Visualiza\u00e7\u00e3o com XID ''{0}'' n\u00e3o existe atualmente e n\u00e3o tem um valor 'tipo'. Tipos v\u00e1lidos s\u00e3o {1}
-emport.dataSource.xid=Um data source com nome ''{0}'' n\u00e3o tem um valor 'xid' v\u00e1lido. Ignorado.
-emport.dataSource.missingType=Data source com XID ''{0}'' n\u00e3o existe atualmente e n\u00e3o tem um valor 'tipo'. Tipos v\u00e1lidos s\u00e3o {1}
-emport.dataSource.invalidType=Data source com XID ''{0}''n\u00e3o existe atualmente e tem um valor 'tipo' inv\u00e1lido: ''{1}''. Tipos v\u00e1lidos s\u00e3o {2}
+emport.view.missingType=Visualiza\u00e7\u00e3o com XID ''{0}'' n\u00e3o existe atualmente e n\u00e3o tem um valor ’tipo’. Tipos v\u00e1lidos s\u00e3o {1}
+emport.dataSource.xid=Um data source com nome ''{0}'' n\u00e3o tem um valor ’xid’ v\u00e1lido. Ignorado.
+emport.dataSource.missingType=Data source com XID ''{0}'' n\u00e3o existe atualmente e n\u00e3o tem um valor ’tipo’. Tipos v\u00e1lidos s\u00e3o {1}
+emport.dataSource.invalidType=Data source com XID ''{0}'' n\u00e3o existe atualmente e tem um valor ’tipo’ inv\u00e1lido: ''{1}''. Tipos v\u00e1lidos s\u00e3o {2}
 emport.dataSource.prefix=Data source ''{0}'': {1}
-emport.dataPoint.xid=Um data point com name ''{0}'' n\u00e3o tem um valor 'xid'. Ignorado.
+emport.dataPoint.xid=Um data point com name ''{0}'' n\u00e3o tem um valor ’xid’. Ignorado.
 emport.dataPoint.badReference=Data point com XID ''{0}'' n\u00e3o existe atualmente e referencia um data source que n\u00e3o existe. Ignorado.
 emport.dataPoint.prefix=Data point ''{0}'': {1}
 emport.userPermission.prefix=Permiss\u00f5es para usu\u00e1rio ''{0}'': {1}
 emport.added=adicionado
 emport.saved=salvo
 emport.causedBy=causado por:
-emport.view.xid=Uma visualiza\u00e7\u00e3o gr\u00e1fica n\u00e3o possui um valor 'xid'. Ignorado.
+emport.view.xid=Uma visualiza\u00e7\u00e3o gr\u00e1fica n\u00e3o possui um valor ’xid’. Ignorado.
 emport.view.prefix=Visualiza\u00e7\u00e3o ''{0}'': {1}
 emport.pointHierarchy.prefix=Hierarquia de ponto: {0}
-emport.pointLink.xid=Um v\u00ednculo de ponto n\u00e3o possui um valor 'xid'. Ignorado.
+emport.pointLink.xid=Um v\u00ednculo de ponto n\u00e3o possui um valor ’xid’. Ignorado.
 emport.pointLink.prefix=V\u00ednculo de ponto ''{0}'': {1}
-emport.scheduledEvent.xid=Um evento agendado n\u00e3o possui um valor 'xid'. Ignorado.
+emport.scheduledEvent.xid=Um evento agendado n\u00e3o possui um valor ’xid’. Ignorado.
 emport.scheduledEvent.prefix=Evento agendado ''{0}'': {1}
-emport.compoundEvent.xid=Um detector de eventos compostos n\u00e3o possui um valor 'xid'. Ignorado.
+emport.compoundEvent.xid=Um detector de eventos compostos n\u00e3o possui um valor ’xid’. Ignorado.
 emport.compoundEvent.prefix=Detector de eventos compostos ''{0}'': {1}
-emport.mailingList.xid=Uma lista de envio de mensagens n\u00e3o possui um valor 'xid'. Ignorado.
+emport.mailingList.xid=Uma lista de envio de mensagens n\u00e3o possui um valor ’xid’. Ignorado.
 emport.mailingList.prefix=Lista de envio de mensagens ''{0}'': {1}
-emport.eventHandler.xid=Um v\u00ednculo de ponto n\u00e3o posssui um valor 'xid'. Ignorado.
+emport.eventHandler.xid=Um v\u00ednculo de ponto n\u00e3o posssui um valor ’xid’. Ignorado.
 emport.eventHandler.prefix=V\u00ednculo de ponto ''{0}'': {1}
-emport.publisher.xid=Um data source com nome ''{0}'' n\u00e3o tem um valor 'xid'. Ignorado.
-emport.publisher.missingType=Publisher com XID ''{0}'' n\u00e3o existe atualmente e n\u00e3o possui um valor 'tipo'. Tipos v\u00e1lidos s\u00e3o  {1}
-emport.publisher.invalidType=Publisher com XID ''{0}'' n\u00e3o existe atualmente e tem um valor 'tipo' inv\u00e1lido: ''{1}''. Tipos v\u00e1lidos s\u00e3o {2}
+emport.publisher.xid=Um data source com nome ''{0}'' n\u00e3o tem um valor ’xid’. Ignorado.
+emport.publisher.missingType=Publisher com XID ''{0}'' n\u00e3o existe atualmente e n\u00e3o possui um valor ’tipo’. Tipos v\u00e1lidos s\u00e3o  {1}
+emport.publisher.invalidType=Publisher com XID ''{0}'' n\u00e3o existe atualmente e tem um valor ’tipo’ inv\u00e1lido: ''{1}''. Tipos v\u00e1lidos s\u00e3o {2}
 emport.publisher.prefix=Publisher ''{0}'': {1}
-emport.watchList.xid=Uma lista de visualiza\u00e7\u00e3o n\u00e3o possui um valor para 'xid'. Ignorada.
+emport.watchList.xid=Uma lista de visualiza\u00e7\u00e3o n\u00e3o possui um valor para ’xid’. Ignorada.
 emport.watchList.prefix=Lista de visualiza\u00e7\u00e3o ''{0}'': {1}
-emport.maintenanceEvent.xid=Um evento de manuten\u00e7\u00e3o n\u00e3o possui um valor para 'xid'. Ignorado.
+emport.maintenanceEvent.xid=Um evento de manuten\u00e7\u00e3o n\u00e3o possui um valor para ’xid’. Ignorado.
 emport.maintenanceEvent.prefix=Evento de manuten\u00e7\u00e3o ''{0}'': {1}
 
 eventHandlers.recipTestEmailMessage= Essa mensagem foi enviada como um teste de um tratador de evento de email
@@ -1377,7 +1377,7 @@ login.validation.accountDisabled=Sua conta de usu\u00e1rio foi desativada. Por f
 login.loginButton=Login
 login.unknownBrowser=Checando a compatibilidade do browser...
 login.supportedBrowser=Este browser \u00e9 suportado.
-login.unsupportedBrowser=Seu browser pode funcionar com este produto, mas n\u00e3o \u00e9 oficialmente suportado pela Equipe Scada-LTS. Recomendamos o uso do <a href="http://www.mozilla.com/" target="_blank">Firefox</a> ou Chrome.
+login.unsupportedBrowser=Seu browser pode funcionar com este produto, mas n\u00e3o \u00e9 oficialmente suportado pela Equipe Scada-LTS. Recomendamos o uso do Mozilla Firefox, Google Chrome.
 login.nag=NOTA: voc\u00ea poder\u00e1 ter problemas com o ScadaLTS porque seu browser n\u00e3o \u00e9 oficialmente suportado. Por favor, atualize seu browser.  
 mailingLists.added=Lista de envio adicionada
 mailingLists.saved=Lista de envio salva
@@ -1443,7 +1443,7 @@ notes.cancel=Cancelar
 notes.timeByUsername=time by username
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pointDetails.recordCountError=Contagem de grava\u00e7\u00e3o precisa ser um n\u00famero
 pointDetails.timePeriodError=Tempo precisa ser um n\u00famero
 pointDetails.imageCountError=Contagem de imagem precisa ser um n\u00famero
@@ -1479,7 +1479,7 @@ pointDetails.accessType=Tipo de acesso
 pointEdit.buttons.enable=Habilitar
 pointEdit.buttons.disable=Desabilitar
 pointEdit.buttons.restart=Reiniciar
-pointEdit.buttons.note=<span class="smallTitle">Nota:</span> salvar, desabilitar ou reiniciar um data point far\u00e1 com que todos os eventos ativos retornem ao normal.
+pointEdit.buttons.note=salvar, desabilitar ou reiniciar um data point far\u00e1 com que todos os eventos ativos retornem ao normal.
 
 pointEdit.chart.props=Propriedades do renderizador de gr\u00e1ficos
 pointEdit.chart.type=Tipo
@@ -1632,7 +1632,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.areYouSureToMoveElement=Are you sure to move element?
 pointHierarchySLTS.movedElement=Moved element
@@ -1836,7 +1836,7 @@ scheduledEvents.validate.inactiveTrigger=Erro ao criar gatilho inativo: {0}
 scheduledEvents.validate.aliasTooLong=Alias n\u00e3o pode ser maior que 50 caracteres
 scheduledEvents.validate.invalidRtn=Inactive time must be after active time
 
-sql.warning=<span class="formError">Alerta:</span> use esta funcionalidade por risco pr\u00f3prio. Uso incorreto pode resultar em dados corrompidos e/ou falhas no sistema. 
+sql.warning=use esta funcionalidade por risco pr\u00f3prio. Uso incorreto pode resultar em dados corrompidos e/ou falhas no sistema. 
 sql.sql=SQL
 sql.query=Enviar consulta
 sql.update=Enviar atualiza\u00e7\u00e3o
@@ -2032,7 +2032,7 @@ viewEdit.compound.duration=Dura\u00e7\u00e3o
 
 views.title=Representa\u00e7\u00f5es Gr\u00e1ficas
 views.newView=Nova representa\u00e7\u00e3o
-views.noViews=Voc\u00ea n\u00e3o criou nenhuma representa\u00e7\u00e3o gr\u00e1fica. Crie uma <a href="view_edit.shtm">agora</a>.
+views.noViews=Voc\u00ea n\u00e3o criou nenhuma representa\u00e7\u00e3o gr\u00e1fica. Crie uma 
 
 watchlist.addToWatchlist=Adicionar na watch list
 watchlist.points=Points
@@ -2130,7 +2130,7 @@ event.system.process=Falha do processo do tratador de eventos
 
 event.audit.added=User "{0}" criado {1} com id {2}: {3}
 event.audit.changed=User "{0}" alerado {1} com id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty={0}: "{1}" to "{2}"
 event.audit.compoundEventDetector=Detector de evento composto
 event.audit.dataPoint=Data point
 event.audit.dataSource=Data source
@@ -2139,7 +2139,7 @@ event.audit.eventHandler=Tratador de evento
 event.audit.maintenanceEvent=Evento de manuten\u00e7\u00e3o
 event.audit.pointEventDetector=Detector de evento de data point
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2380,7 +2380,7 @@ event.ds.initialization=Exce\u00e7\u00e3o de inicializa\u00e7\u00e3o
 event.ds.message=Exce\u00e7\u00e3o de mensagem
 event.ds.device=Exce\u00e7\u00e3o de dispositivo
 event.ds.network=Exce\u00e7\u00e3o de rede
-event.ds.duplicateComm=Endere\u00e7o <b>comm</b> duplicado detectado
+event.ds.duplicateComm=Endere\u00e7o comm duplicado detectado
 event.ds.dataSource=Exce\u00e7\u00e3o de data source
 event.ds.pointRead=Exce\u00e7\u00e3o de leitura de data point
 event.ds.pointWrite=Exce\u00e7\u00e3o de escrita em data point
@@ -2479,7 +2479,7 @@ emport.error.eventCode=C\u00f3digo de evento ''{0}'' inv\u00e1lido. C\u00f3digos
 emport.error.alarmLevel=N\u00edvel de alarme ''{0}'' inv\u00e1lido para evento ''{1}''. Valores v\u00e1lidos s\u00e3o {2}
 emport.error.missingUser=Usu\u00e1rio com nome de usu\u00e1rio ''{0}'' n\u00e3o encontrado
 emport.error.viewShare.missing=''{0}'' faltando em compartilhamento da representa\u00e7\u00e3o
-emport.error.component.incompatibleDataType=Data point com 'XID' ''{0}'' possui tipo de dado n\u00e3o compat\u00edvel com com tipo de visualiza\u00e7\u00e3o de componente ''{1}''
+emport.error.component.incompatibleDataType=Data point com ’XID’ ''{0}'' possui tipo de dado n\u00e3o compat\u00edvel com com tipo de visualiza\u00e7\u00e3o de componente ''{1}''
 emport.error.compound.invalidChildId=Id filho ''{0}'' inv\u00e1lido para componente de visualiza\u00e7\u00e3o composto do tipo ''{1}''. Ids v\u00e1lidos s\u00e3o {2}
 emport.error.component.unknownDynamicImage=Id de imagem din\u00e2mica ''{0}'' n\u00e3o encontrado. Ids de imagens din\u00e2micas s\u00e3o {1}
 emport.error.component.unknownImageSet=Id de defini\u00e7\u00e3o de imagem ''{0}'' n\u00e3o encontrado. Ids de defini\u00e7\u00e3o de imagem conhecidos s\u00e3o {1}
@@ -2695,8 +2695,8 @@ engUnit.188=Newtons por metro
 engUnit.189=watts por metro por Kelvin
 engUnit.190=kilometros
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.2=mA
 engUnit.abbr.3=A
 engUnit.abbr.4=ohms
@@ -2718,22 +2718,22 @@ engUnit.abbr.19=kWh
 engUnit.abbr.20=btus
 engUnit.abbr.21=therms
 engUnit.abbr.22=ton hours
-engUnit.abbr.23=J/Kg <inf>ar seco</inf>
-engUnit.abbr.24=btus/lb <inf>ar seco</inf>
+engUnit.abbr.23=J/Kg ar seco
+engUnit.abbr.24=btus/lb ar seco
 engUnit.abbr.25=ciclos por hora
 engUnit.abbr.26=ciclos por minuto
 engUnit.abbr.27=hertz
-engUnit.abbr.28=g <inf>H<inf>2</inf>O</inf> / kg <inf>ar seco</inf>
+engUnit.abbr.28=g H\u2082O / kg ar seco
 engUnit.abbr.29=%UR
 engUnit.abbr.30=mm
 engUnit.abbr.31=m
 engUnit.abbr.32=pol
 engUnit.abbr.33=p\u00e9s
-engUnit.abbr.34=W/p\u00e9<sup>2</sup>
-engUnit.abbr.35=W/m<sup>2</sup>
+engUnit.abbr.34=W/p\u00e9\u00b2
+engUnit.abbr.35=W/m\u00b2
 engUnit.abbr.36=lm
 engUnit.abbr.37=lx
-engUnit.abbr.38=lm/p\u00e9<sup>2</sup>
+engUnit.abbr.38=lm/p\u00e9\u00b2
 engUnit.abbr.39=kg
 engUnit.abbr.40=lb
 engUnit.abbr.41=t
@@ -2751,12 +2751,12 @@ engUnit.abbr.52=RT
 engUnit.abbr.53=Pa
 engUnit.abbr.54=kPa
 engUnit.abbr.55=bar
-engUnit.abbr.56=lbf/pol<sup>2</sup>
-engUnit.abbr.57=cm<inf>H<inf>2</inf>O</inf>
-engUnit.abbr.58=pol<inf>H<inf>2</inf>O</inf>
-engUnit.abbr.59=mm<inf>Hg</inf>
-engUnit.abbr.60=cm<inf>Hg</inf>
-engUnit.abbr.61=pol<inf>Hg</inf>
+engUnit.abbr.56=lbf/pol\u00b2
+engUnit.abbr.57=cmH\u2082O
+engUnit.abbr.58=polH\u2082O
+engUnit.abbr.59=mmHg
+engUnit.abbr.60=cmHg
+engUnit.abbr.61=polHg
 engUnit.abbr.62=&deg;C
 engUnit.abbr.63=K
 engUnit.abbr.64=&deg;F
@@ -2774,17 +2774,17 @@ engUnit.abbr.75=km/h
 engUnit.abbr.76=p\u00e9s/s
 engUnit.abbr.77=p\u00e9s/min
 engUnit.abbr.78=m/h
-engUnit.abbr.79=p\u00e9s<sup>3</sup>
-engUnit.abbr.80=m<sup>3</sup>
-engUnit.abbr.81=Ga<inf>UK</inf>
+engUnit.abbr.79=p\u00e9s\u00b3
+engUnit.abbr.80=m\u00b3
+engUnit.abbr.81=GaUK
 engUnit.abbr.82=l
-engUnit.abbr.83=Ga<inf>US</inf>
-engUnit.abbr.84=p\u00e9s<sup>3</sup>/min
-engUnit.abbr.85=m<sup>3</sup>/s
-engUnit.abbr.86=Ga<inf>UK</inf>/min
+engUnit.abbr.83=GaUS
+engUnit.abbr.84=p\u00e9s\u00b3/min
+engUnit.abbr.85=m\u00b3/s
+engUnit.abbr.86=GaUK/min
 engUnit.abbr.87=l/s
 engUnit.abbr.88=l/m
-engUnit.abbr.89=Ga<inf>US</inf>/min
+engUnit.abbr.89=GaUS/min
 engUnit.abbr.90=&deg;
 engUnit.abbr.91=&deg;C/h
 engUnit.abbr.92=&deg;F/min
@@ -2810,8 +2810,8 @@ engUnit.abbr.111=currency 7
 engUnit.abbr.112=currency 8
 engUnit.abbr.113=currency 9
 engUnit.abbr.114=currency 10
-engUnit.abbr.115=pol<sup>2</sup>
-engUnit.abbr.116=cm<sup>2</sup>
+engUnit.abbr.115=pol\u00b2
+engUnit.abbr.116=cm\u00b2
 engUnit.abbr.117=BTU/lb
 engUnit.abbr.118=cm
 engUnit.abbr.119=lb/s
@@ -2830,22 +2830,22 @@ engUnit.abbr.131=/h
 engUnit.abbr.132=mW
 engUnit.abbr.133=hPa
 engUnit.abbr.134=mbar
-engUnit.abbr.135=m<suop>3</sup>/h
+engUnit.abbr.135=m\u00b3/h
 engUnit.abbr.136=l/h
-engUnit.abbr.137=kWh/m<sup>2</sup>
-engUnit.abbr.138=kWh/p\u00e9<sup>2</sup>
-engUnit.abbr.139=MJ/m<sup>2</sup>
-engUnit.abbr.140=MJ/p\u00e9<sup>2</sup>
-engUnit.abbr.141=W/m<sup>2</sup>K
-engUnit.abbr.142=p\u00e9s<sup>3</sup>/s
+engUnit.abbr.137=kWh/m\u00b2
+engUnit.abbr.138=kWh/p\u00e9\u00b2
+engUnit.abbr.139=MJ/m\u00b2
+engUnit.abbr.140=MJ/p\u00e9\u00b2
+engUnit.abbr.141=W/m\u00b2K
+engUnit.abbr.142=p\u00e9s\u00b3/s
 engUnit.abbr.143=%obs/p\u00e9
 engUnit.abbr.144=%pbs/m
 engUnit.abbr.145=m&Omega;
 engUnit.abbr.146=MWh
 engUnit.abbr.147=kBTU
 engUnit.abbr.148=MBTU
-engUnit.abbr.149=kJ/kg<inf>ar seco</inf>
-engUnit.abbr.150=MJ/kg<inf>ar seco</inf>
+engUnit.abbr.149=kJ/kg ar seco
+engUnit.abbr.150=MJ/kg ar seco
 engUnit.abbr.151=kJ/K
 engUnit.abbr.152=MJ/K
 engUnit.abbr.153=N
@@ -2853,18 +2853,18 @@ engUnit.abbr.154=g/s
 engUnit.abbr.155=g/min
 engUnit.abbr.156=t/h
 engUnit.abbr.157=kBTU/h
-engUnit.abbr.158=s x 10<sup>2</sup>
+engUnit.abbr.158=s x 10\u00b2
 engUnit.abbr.159=ms
 engUnit.abbr.160=Nm
 engUnit.abbr.161=mm/s
 engUnit.abbr.162=mm/min
 engUnit.abbr.163=m/min
 engUnit.abbr.164=m/h
-engUnit.abbr.165=m<sup>3</sup>/min
-engUnit.abbr.166=m/s<sup>2</sup>
+engUnit.abbr.165=m\u00b3/min
+engUnit.abbr.166=m/s\u00b2
 engUnit.abbr.167=A/m
-engUnit.abbr.168=A/m<sup>2</sup>
-engUnit.abbr.169=Am<sup>2</sup>
+engUnit.abbr.168=A/m\u00b2
+engUnit.abbr.169=Am\u00b2
 engUnit.abbr.170=Fd
 engUnit.abbr.171=H
 engUnit.abbr.172=&Omega;m
@@ -2875,13 +2875,13 @@ engUnit.abbr.176=V/K
 engUnit.abbr.177=V/m
 engUnit.abbr.178=Wb
 engUnit.abbr.179=cd
-engUnit.abbr.180=cd/m<sup>2</sup>
+engUnit.abbr.180=cd/m\u00b2
 engUnit.abbr.181=K/h
 engUnit.abbr.182=K/min
 engUnit.abbr.183=Js
 engUnit.abbr.184=rad/s
-engUnit.abbr.185=m<sup>2</sup>/N
-engUnit.abbr.186=kg/m<sup>3</sup>
+engUnit.abbr.185=m\u00b2/N
+engUnit.abbr.186=kg/m\u00b3
 engUnit.abbr.187=Ns
 engUnit.abbr.188=N/m
 engUnit.abbr.189=W/mK
@@ -3349,7 +3349,7 @@ dsEdit.mbus.phoneNumber=Phone Number
 graphic.enhancedImageChart.config.zoomOut=Zoom out
 dsEdit.mbus.tcpAddr=TCP Address
 pointHierarchySLTS.folder=Folder
-eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler's inactive list
+eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler’s inactive list
 graphic.enhancedImageChart.pointConfig.renderMode.line=Line
 event.maintenance.active=Maintenance event activated\: {0}
 dsEdit.snmp.sl.authnopriv=Only authentication
@@ -3478,16 +3478,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=Nota:
+sql.warning.prefix=Alerta:
+views.noViews.prefix=agora.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_ru.properties b/test/messages_ru.properties
index 4aba684182..3a4d6023d1 100644
--- a/test/messages_ru.properties
+++ b/test/messages_ru.properties
@@ -666,7 +666,7 @@ dsEdit.meta.event.week=\u041d\u0430\u0447\u0430\u043b\u043e \u043d\u0435\u0434\u
 dsEdit.meta.event.month=\u041d\u0430\u0447\u0430\u043b\u043e \u043c\u0435\u0441\u044f\u0446\u0430
 dsEdit.meta.event.year=\u041d\u0430\u0447\u0430\u043b\u043e \u0433\u043e\u0434\u0430
 dsEdit.meta.event.cron=\u0428\u0430\u0431\u043b\u043e\u043d \u043a\u0440\u043e\u043d\u0430
-dsEdit.meta.delay=\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f <br/>
+dsEdit.meta.delay=\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f 
 dsEdit.meta.test.success=\u0423\u0441\u043f\u0435\u0448\u043d\u043e. \u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442={0}
 dsEdit.meta.test.successTs=\u0423\u0441\u043f\u0435\u0448\u043d\u043e. \u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442={0}, \u0432\u0440\u0435\u043c\u044f={1}
 dsEdit.meta.test.context=\u041e\u0434\u043d\u0430 \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u0442\u043e\u0447\u0435\u043a \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u044b \u0438\u043b\u0438 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0442
@@ -968,16 +968,16 @@ dsEdit.viconics.networkInfo=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u04
 dsEdit.viconics.refreshing=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435...
 dsEdit.viconics.rfModule=\u0420\u0430\u0434\u0438\u043e\u043c\u043e\u0434\u0443\u043b\u044c
 dsEdit.viconics.devices=\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430
-dsEdit.viconics.commAddress=\u0410\u0434\u0440\u0435\u0441  <br/> \u0441\u0432\u044f\u0437\u0438
-dsEdit.viconics.modelNumber=\u041d\u043e\u043c\u0435\u0440 <br/> \u043c\u043e\u0434\u0435\u043b\u0438
-dsEdit.viconics.firmwareRevision=\u0412\u0435\u0440\u0441\u0438\u044f <br/> \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b
+dsEdit.viconics.commAddress=\u0410\u0434\u0440\u0435\u0441    \u0441\u0432\u044f\u0437\u0438
+dsEdit.viconics.modelNumber=\u041d\u043e\u043c\u0435\u0440  \u043c\u043e\u0434\u0435\u043b\u0438
+dsEdit.viconics.firmwareRevision=\u0412\u0435\u0440\u0441\u0438\u044f  \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b
 dsEdit.viconics.zigbeeFirmwareRevision=\u0412\u0435\u0440\u0441\u0438\u044f \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b Zigbee 
-dsEdit.viconics.zigbeeFirmwareRevisionBr= \u0412\u0435\u0440\u0441\u0438\u044f <br/> \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b <br/> Zigbee
+dsEdit.viconics.zigbeeFirmwareRevisionBr= \u0412\u0435\u0440\u0441\u0438\u044f  \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b  Zigbee
 dsEdit.viconics.zigbeeNetworkAddress=\u0410\u0434\u0440\u0435\u0441 \u0441\u0435\u0442\u0438 Zigbee 
-dsEdit.viconics.zigbeeNetworkAddressBr= \u0410\u0434\u0440\u0435\u0441 <br/> \u0441\u0435\u0442\u0438 <br/> Zigbee
+dsEdit.viconics.zigbeeNetworkAddressBr= \u0410\u0434\u0440\u0435\u0441  \u0441\u0435\u0442\u0438  Zigbee
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=\u0412\u0435\u0440\u0441\u0438\u044f \u043c\u0438\u043a\u0440\u043e\u0447\u0438\u043f\u0430
-dsEdit.viconics.chipRevisionBr=\u0412\u0435\u0440\u0441\u0438\u044f <br/> \u043c\u0438\u043a\u0440\u043e\u0447\u0438\u043f\u0430
+dsEdit.viconics.chipRevisionBr=\u0412\u0435\u0440\u0441\u0438\u044f  \u043c\u0438\u043a\u0440\u043e\u0447\u0438\u043f\u0430
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.unreliable=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0442\u043e\u0447\u043a\u0438 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043e\u0448\u0438\u0431\u043e\u0447\u043d\u044b\u043c
@@ -1120,42 +1120,42 @@ emport.importProgress=\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u04
 emport.importCancelled=\u0418\u043c\u043f\u043e\u0440\u0442 \u043e\u0442\u043c\u0435\u043d\u0435\u043d
 emport.importComplete=\u0418\u043c\u043f\u043e\u0440\u0442 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d
 emport.noMessages=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438. \u041d\u0435\u0442 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 \u0434\u043b\u044f \u0438\u043c\u043f\u043e\u0440\u0442\u0430?
-emport.invalidImportData=\u041d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0438\u043c\u043f\u043e\u0440\u0442\u0430: \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f  \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u043c JSON
+emport.invalidImportData=\u041d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0438\u043c\u043f\u043e\u0440\u0442\u0430: \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f  \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u043c JSON. (www.json.org)
 emport.parseError=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438 JSON : {0}
 emport.user.username=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044e \u043d\u0435 \u043f\u0440\u0438\u0441\u0432\u043e\u0435\u043d\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 '\u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.user.prefix=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c ''{0}'': {1}
 emport.view.missingType=\u0412\u0438\u0434 \u0441 XID ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442, \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 '\u0442\u0438\u043f' \u043d\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e. \u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0442\u0438\u043f\u044b: {1}
-emport.dataSource.xid=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 \u0438\u043c\u0435\u043d\u0435\u043c ''{0}'' \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
-emport.dataSource.missingType=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445 XID ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442, \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 '\u0442\u0438\u043f' \u043d\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e. \u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0442\u0438\u043f\u044b: {1}
+emport.dataSource.xid=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 \u0438\u043c\u0435\u043d\u0435\u043c ''{0}'' \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.dataSource.missingType=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445 XID ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442, \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 ’\u0442\u0438\u043f’ \u043d\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e. \u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0442\u0438\u043f\u044b: {1}
 emport.dataSource.invalidType=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 XID ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0438 \u0438\u043c\u0435\u0435\u0442 \u043d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 '\u0442\u0438\u043f' \u0434\u043b\u044f ''{1}''. \u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0442\u0438\u043f\u044b: {2}
 emport.dataSource.prefix=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445 ''{0}'': {1}
-emport.dataPoint.xid=\u0414\u043b\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 \u0438\u043c\u0435\u043d\u0435\u043c ''{0}'' \u043d\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.dataPoint.xid=\u0414\u043b\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 \u0438\u043c\u0435\u043d\u0435\u043c ''{0}'' \u043d\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.dataPoint.badReference=\u0422\u043e\u0447\u043a\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 XID ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0438 \u0441\u0441\u044b\u043b\u0430\u0435\u0442\u0441\u044f \u043d\u0430 \u043d\u0435\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.dataPoint.prefix=\u041e\u0431\u044a\u0435\u043a\u0442 \u0434\u0430\u043d\u043d\u044b\u0445 ''{0}'': {1}
 emport.userPermission.prefix=\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f ''{0}'': {1}
 emport.added=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e
 emport.saved=\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043e
 emport.causedBy=\u0412\u044b\u0437\u0432\u0430\u043d\u043e:
-emport.view.xid=\u0413\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0432\u0438\u0434 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.view.xid=\u0413\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0432\u0438\u0434 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.view.prefix=\u0412\u0438\u0434 ''{0}'': {1}
 emport.pointHierarchy.prefix=\u0418\u0435\u0440\u0430\u0440\u0445\u0438\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432: {0}
-emport.pointLink.xid=\u0421\u0432\u044f\u0437\u044c \u0442\u043e\u0447\u0435\u043a \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.pointLink.xid=\u0421\u0432\u044f\u0437\u044c \u0442\u043e\u0447\u0435\u043a \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.pointLink.prefix=\u0421\u0432\u044f\u0437\u044c \u0442\u043e\u0447\u0435\u043a ''{0}'': {1}
-emport.scheduledEvent.xid=\u0417\u0430\u043f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0435 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.scheduledEvent.xid=\u0417\u0430\u043f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0435 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.scheduledEvent.prefix=\u0417\u0430\u043f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0435 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 ''{0}'': {1}
-emport.compoundEvent.xid=\u0421\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0439 \u0434\u0435\u0442\u0435\u043a\u0442\u043e\u0440 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 
+emport.compoundEvent.xid=\u0421\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0439 \u0434\u0435\u0442\u0435\u043a\u0442\u043e\u0440 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 
 emport.compoundEvent.prefix=\u0421\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0439 \u0434\u0435\u0442\u0435\u043a\u0442\u043e\u0440 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 ''{0}'': {1}
-emport.mailingList.xid=\u0421\u043f\u0438\u0441\u043e\u043a \u0440\u0430\u0441\u0441\u044b\u043b\u043a\u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.mailingList.xid=\u0421\u043f\u0438\u0441\u043e\u043a \u0440\u0430\u0441\u0441\u044b\u043b\u043a\u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.mailingList.prefix=\u0421\u043f\u0438\u0441\u043e\u043a \u0440\u0430\u0441\u0441\u044b\u043b\u043a\u0438 ''{0}'': {1}
-emport.eventHandler.xid=\u0421\u0432\u044f\u0437\u044c \u0442\u043e\u0447\u043a\u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.eventHandler.xid=\u0421\u0432\u044f\u0437\u044c \u0442\u043e\u0447\u043a\u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.eventHandler.prefix=\u0421\u0432\u044f\u0437\u044c \u0442\u043e\u0447\u043a\u0438 ''{0}'': {1}
-emport.publisher.xid=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 \u0438\u043c\u0435\u043d\u0435\u043c ''{0}'' \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f  'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.publisher.xid=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 \u0438\u043c\u0435\u043d\u0435\u043c ''{0}'' \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f  ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.publisher.missingType=\u041f\u0443\u0431\u043b\u0438\u043a\u0430\u0442\u043e\u0440 \u0441 XID ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f '\u0442\u0438\u043f'. \u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0442\u0438\u043f\u044b: {1}
 emport.publisher.invalidType=\u041f\u0443\u0431\u043b\u0438\u043a\u0430\u0442\u043e\u0440 \u0441 XID ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0438 \u0438\u043c\u0435\u0435\u0442 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 '\u0442\u0438\u043f' \u0434\u043b\u044f ''{1}''. \u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f: {2}
 emport.publisher.prefix=\u041f\u0443\u0431\u043b\u0438\u043a\u0430\u0442\u043e\u0440 ''{0}'': {1}
-emport.watchList.xid=\u041b\u0438\u0441\u0442 \u043d\u0430\u0431\u043b\u044e\u0434\u0435\u043d\u0438\u044f \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.watchList.xid=\u041b\u0438\u0441\u0442 \u043d\u0430\u0431\u043b\u044e\u0434\u0435\u043d\u0438\u044f \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.watchList.prefix=\u041b\u0438\u0441\u0442 \u043d\u0430\u0431\u043b\u044e\u0434\u0435\u043d\u0438\u044f ''{0}'': {1}
-emport.maintenanceEvent.xid=\u0421\u043e\u0431\u044b\u0442\u0438\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f 'XID'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
+emport.maintenanceEvent.xid=\u0421\u043e\u0431\u044b\u0442\u0438\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f ’XID’. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.maintenanceEvent.prefix=\u0421\u043e\u0431\u044b\u0442\u0438\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f ''{0}'': {1}
 
 eventHandlers.recipTestEmailMessage=\u0414\u0430\u043d\u043d\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043e \u0434\u043b\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u0441\u043f\u0438\u0441\u043a\u0430 \u0440\u0430\u0441\u0441\u044b\u043b\u043a\u0438 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0430 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 (\u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0445 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439)
@@ -1294,7 +1294,7 @@ login.validation.accountDisabled=\u0412\u0430\u0448 \u0430\u043a\u043a\u0430\u04
 login.loginButton=\u041b\u043e\u0433\u0438\u043d
 login.unknownBrowser=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u043e\u0441\u0442\u0438 \u0412\u0430\u0448\u0435\u0433\u043e \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0430...
 login.supportedBrowser=\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.
-login.unsupportedBrowser=\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043c\u043e\u0436\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u0441 \u044d\u0442\u0438\u043c \u043f\u0440\u043e\u0434\u0443\u043a\u0442\u043e\u043c, \u043d\u043e \u043e\u0444\u0438\u0446\u0438\u0430\u043b\u044c\u043d\u043e \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u044b\u043c \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435\u043c Scada-LTS.  \u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u043c\u0435\u0441\u0442\u043e \u043d\u0435\u0433\u043e <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, \u0438\u043b\u0438 Internet Explorer 7.
+login.unsupportedBrowser=\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043c\u043e\u0436\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u0441 \u044d\u0442\u0438\u043c \u043f\u0440\u043e\u0434\u0443\u043a\u0442\u043e\u043c, \u043d\u043e \u043e\u0444\u0438\u0446\u0438\u0430\u043b\u044c\u043d\u043e \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u044b\u043c \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435\u043c Scada-LTS.  \u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u043c\u0435\u0441\u0442\u043e \u043d\u0435\u0433\u043e Mozilla Firefox, Google Chrome.
 login.nag=\u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435: \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u044b \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u0441\u043e ScadaLTS, \u0442\u0430\u043a \u043a\u0430\u043a \u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043e\u0444\u0438\u0446\u0438\u0430\u043b\u044c\u043d\u043e \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u0435 \u0431\u0440\u0430\u0443\u0437\u0435\u0440. 
 
 mailingLists.added=\u0421\u043f\u0438\u0441\u043e\u043a \u0440\u0430\u0441\u0441\u044b\u043b\u043a\u0438 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d
@@ -1362,7 +1362,7 @@ notes.cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
 notes.timeByUsername=\u0412\u0440\u0435\u043c\u044f \u043f\u043e \u0438\u043c\u0435\u043d\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pointDetails.recordCountError=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0437\u0430\u043f\u0438\u0441\u0435\u0439 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0447\u0438\u0441\u043b\u043e\u043c
 pointDetails.timePeriodError=\u041f\u0435\u0440\u0438\u043e\u0434 \u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0447\u0438\u0441\u043b\u043e\u043c
 pointDetails.imageCountError=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0447\u0438\u0441\u043b\u043e\u043c
@@ -1398,7 +1398,7 @@ pointDetails.accessType=\u0422\u0438\u043f \u0434\u043e\u0441\u0442\u0443\u043f\
 pointEdit.buttons.enable=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c
 pointEdit.buttons.disable=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c
 pointEdit.buttons.restart=\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c
-pointEdit.buttons.note=<span class="smallTitle">\u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435:</span> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435, \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u0432\u043e\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u0442 \u0432\u0441\u0435 \u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0441\u043e\u0431\u044b\u0442\u0438\u044f \u0432 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435
+pointEdit.buttons.note=\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435, \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u0432\u043e\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u0442 \u0432\u0441\u0435 \u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0441\u043e\u0431\u044b\u0442\u0438\u044f \u0432 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435
 
 pointEdit.chart.props=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044f \u0433\u0440\u0430\u0444\u0438\u043a\u043e\u0432 
 pointEdit.chart.type=\u0422\u0438\u043f
@@ -1551,7 +1551,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.areYouSureToMoveElement=Are you sure to move element?
 pointHierarchySLTS.movedElement=Moved element
@@ -1752,7 +1752,7 @@ scheduledEvents.validate.inactiveTrigger=\u041e\u0448\u0438\u0431\u043a\u0430 \u
 scheduledEvents.validate.aliasTooLong=\u0414\u043b\u0438\u043d\u0430 \u043f\u0441\u0435\u0432\u0434\u043e\u043d\u0438\u043c\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0431\u043e\u043b\u0435\u0435 50 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432
 scheduledEvents.validate.invalidRtn=\u0412\u0440\u0435\u043c\u044f \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u043f\u043e\u0437\u0436\u0435 \u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f 
 
-sql.warning=<span class="formError">\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435:</span> \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u0443 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043d\u0430 \u0432\u0430\u0448 \u0441\u0442\u0440\u0430\u0445 \u0438 \u0440\u0438\u0441\u043a. \u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u043a \u043f\u043e\u0442\u0435\u0440\u0435 \u0434\u0430\u043d\u043d\u044b\u0445 \u0438/\u0438\u043b\u0438 \u0441\u0431\u043e\u044f\u043c \u0432 \u0440\u0430\u0431\u043e\u0442\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u044b. 
+sql.warning= \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u0443 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043d\u0430 \u0432\u0430\u0448 \u0441\u0442\u0440\u0430\u0445 \u0438 \u0440\u0438\u0441\u043a. \u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u043a \u043f\u043e\u0442\u0435\u0440\u0435 \u0434\u0430\u043d\u043d\u044b\u0445 \u0438/\u0438\u043b\u0438 \u0441\u0431\u043e\u044f\u043c \u0432 \u0440\u0430\u0431\u043e\u0442\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u044b. 
 sql.sql=SQL
 sql.query=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0437\u0430\u043f\u0440\u043e\u0441
 sql.update=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435
@@ -1770,8 +1770,8 @@ systemSettings.upToDate=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u
 systemSettings.emailSettings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0445 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439
 systemSettings.smtpHost=\u0425\u043e\u0441\u0442 SMTP
 systemSettings.smtpPort=\u041f\u043e\u0440\u0442 SMTP 
-systemSettings.fromAddress=\u0410\u0434\u0440\u0435\u0441 \u0432 \u043f\u043e\u043b\u0435 'From:'
-systemSettings.fromName=\u0418\u043c\u044f \u0432 \u043f\u043e\u043b\u0435 'From:' 
+systemSettings.fromAddress=\u0410\u0434\u0440\u0435\u0441 \u0432 \u043f\u043e\u043b\u0435 ’From:’
+systemSettings.fromName=\u0418\u043c\u044f \u0432 \u043f\u043e\u043b\u0435 ’From:’ 
 systemSettings.auth=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044e
 systemSettings.smtpUsername=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
 systemSettings.smtpPassword=\u041f\u0430\u0440\u043e\u043b\u044c
@@ -1930,7 +1930,7 @@ viewEdit.compound.duration=\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u044
 
 views.title=\u0413\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0432\u0438\u0434\u044b
 views.newView=\u041d\u043e\u0432\u044b\u0439 \u0432\u0438\u0434
-views.noViews=\u0412\u044b \u043d\u0435 \u0441\u043e\u0437\u0434\u0430\u043b\u0438 \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u0432\u0438\u0434\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 <a href="view_edit.shtm">\u0441\u0435\u0439\u0447\u0430\u0441</a>.
+views.noViews=\u0412\u044b \u043d\u0435 \u0441\u043e\u0437\u0434\u0430\u043b\u0438 \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u0432\u0438\u0434\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 
 
 watchlist.addToWatchlist=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u043b\u0438\u0441\u0442 \u043d\u0430\u0431\u043b\u044e\u0434\u0435\u043d\u0438\u044f
 watchlist.points=\u0422\u043e\u0447\u043a\u0438
@@ -2030,7 +2030,7 @@ event.system.process=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0431\u0440\u04
 
 event.audit.added=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c "{0}" \u0441\u043e\u0437\u0434\u0430\u043b {1} \u0441 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u043c {2}: {3}
 event.audit.changed=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c "{0}" \u0438\u0437\u043c\u0435\u043d\u0438\u043b {1} \u0441 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u043c {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" \u0432 "{2}"
+event.audit.changedProperty={0}: "{1}" \u0432 "{2}"
 event.audit.compoundEventDetector=\u0421\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0439 \u0434\u0435\u0442\u0435\u043a\u0442\u043e\u0440 \u0441\u043e\u0431\u044b\u0442\u0438\u0439
 event.audit.dataPoint=\u0422\u043e\u0447\u043a\u0430 \u0434\u0430\u043d\u043d\u044b\u0445
 event.audit.dataSource=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445
@@ -2039,7 +2039,7 @@ event.audit.eventHandler=\u041e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\
 event.audit.maintenanceEvent=\u0421\u043e\u0431\u044b\u0442\u0438\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f
 event.audit.pointEventDetector=\u0414\u0435\u0442\u0435\u043a\u0442\u043e\u0440 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u043e\u0431\u044a\u0435\u043a\u0442\u0430
 event.audit.pointLink=\u0421\u0432\u044f\u0437\u044c \u0442\u043e\u0447\u0435\u043a
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2384,7 +2384,7 @@ emport.error.eventCode=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u0
 emport.error.alarmLevel=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439 \u0443\u0440\u043e\u0432\u0435\u043d\u044c \u0442\u0440\u0435\u0432\u043e\u0433\u0438 ''{0}'' \u0434\u043b\u044f \u0441\u043e\u0431\u044b\u0442\u0438\u044f ''{1}''. \u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f: {2}
 emport.error.missingUser=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0441 \u0438\u043c\u0435\u043d\u0435\u043c ''{0}'' \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
 emport.error.viewShare.missing=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 ''{0}'' \u0432 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u043d\u043e\u043c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 \u0432\u0438\u0434\u0430
-emport.error.component.incompatibleDataType=\u0422\u0438\u043f \u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u043e\u0447\u043a\u0438 \u0441 'XID' ''{0}'' \u043d\u0435 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c \u0441 \u0442\u0438\u043f\u043e\u043c \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0432\u0438\u0434\u0430 ''{1}''
+emport.error.component.incompatibleDataType=\u0422\u0438\u043f \u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u043e\u0447\u043a\u0438 \u0441 ’XID’ ''{0}'' \u043d\u0435 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c \u0441 \u0442\u0438\u043f\u043e\u043c \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0432\u0438\u0434\u0430 ''{1}''
 emport.error.compound.invalidChildId=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0432\u043b\u043e\u0436\u0435\u043d\u043d\u043e\u0433\u043e \u043e\u0431\u044a\u0435\u043a\u0442\u0430 ''{0}''  \u0434\u043b\u044f \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0441\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0433\u043e \u0432\u0438\u0434\u0430 \u0442\u0438\u043f\u0430 ''{1}''. \u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b: {2}
 emport.error.component.unknownDynamicImage=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0438\u0437\u043c\u0435\u043d\u044f\u0435\u044e\u0449\u0435\u0433\u043e\u0441\u044f \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f ''{0}'' \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d. \u0418\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0435 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b \u0438\u0437\u043c\u0435\u043d\u044f\u044e\u0449\u0438\u0445\u0441\u044f \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439: {1}
 emport.error.component.unknownImageSet=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u043d\u0430\u0431\u043e\u0440\u0430  \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439 ''{0}'' \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d. \u0418\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0435 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b \u043d\u0430\u0431\u043e\u0440\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439: {1}
@@ -2600,8 +2600,8 @@ engUnit.188=\u041d\u044c\u044e\u0442\u043e\u043d \u043d\u0430 \u043c\u0435\u0442
 engUnit.189=\u0412\u0430\u0442\u0442\u044b \u043d\u0430 \u043c\u0435\u0442\u0440-\u043a\u0435\u043b\u044c\u0432\u0438\u043d
 engUnit.190=kilometers
 
-engUnit.abbr.0=\u043c<sup>2</sup>
-engUnit.abbr.1=\u0444<sup>2</sup>
+engUnit.abbr.0=\u043c\u00b2
+engUnit.abbr.1=\u0444\u00b2
 engUnit.abbr.2=\u043c\u0410
 engUnit.abbr.3=\u0410
 engUnit.abbr.4=\u041e\u043c
@@ -3474,16 +3474,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=\u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435:
+sql.warning.prefix=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435:
+views.noViews.prefix=\u0441\u0435\u0439\u0447\u0430\u0441.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/messages_zh.properties b/test/messages_zh.properties
index 7d451f2719..4664dc8235 100644
--- a/test/messages_zh.properties
+++ b/test/messages_zh.properties
@@ -581,7 +581,7 @@ dsEdit.meta.event.week=\u5f00\u59cb\u7684\u5468\u6570
 dsEdit.meta.event.month=\u5f00\u59cb\u6708\u4efd
 dsEdit.meta.event.year=\u5f00\u59cb\u5e74\u4efd
 dsEdit.meta.event.cron=\u5b9a\u65f6\u5668\u8868\u8fbe\u5f0f
-dsEdit.meta.delay=\u6267\u884c\u5ef6\u65f6<br/>
+dsEdit.meta.delay=\u6267\u884c\u5ef6\u65f6 
 dsEdit.meta.test.success=\u6210\u529f\u3002\u7ed3\u679c={0}
 dsEdit.meta.test.successTs=\u6210\u529f\u3002\u7ed3\u679c={0}\uff0c\u65f6\u95f4\u6233={1}
 dsEdit.meta.test.context=\u4e00\u4e2a\u6216\u8005\u591a\u4e2a\u70b9\u5df2\u5931\u6548\u6216\u8005\u4e0d\u5b58\u5728
@@ -899,31 +899,31 @@ emport.importProgress=\u6b63\u5728\u5bfc\u5165...
 emport.importCancelled=\u5bfc\u5165\u5df2\u53d6\u6d88
 emport.importComplete=\u5bfc\u5165\u5b8c\u6210
 emport.noMessages=\u65e0\u8fd4\u56de\u4fe1\u606f\u3002\u65e0\u9700\u5bfc\u5165?
-emport.invalidImportData=\u5bfc\u5165\u6570\u636e\u65e0\u6548: \u975eJSON\u5bf9\u8c61
+emport.invalidImportData=\u5bfc\u5165\u6570\u636e\u65e0\u6548: \u975eJSON\u5bf9\u8c61. (www.json.org)
 emport.parseError=JSON\u5bf9\u8c61\u5206\u6790\u9519\u8bef: {0}
 emport.user.username=\u7528\u6237\u7f3a\u5c11'\u7528\u6237\u540d'\u3002\u5df2\u5ffd\u7565\u3002
 emport.user.prefix=\u7528\u6237 ''{0}'': {1}
-emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
-emport.dataSource.xid=A\u6570\u636e\u6e90 with name ''{0}'' does not have an 'xid' value. Ignored.
-emport.dataSource.missingType=\u6570\u636e\u6e90 with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
-emport.dataSource.invalidType="\u6570\u636e\u6e90 with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
+emport.view.missingType=View with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
+emport.dataSource.xid=A\u6570\u636e\u6e90 with name ''{0}'' does not have an ’xid’ value. Ignored.
+emport.dataSource.missingType=\u6570\u636e\u6e90 with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
+emport.dataSource.invalidType="\u6570\u636e\u6e90 with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
 emport.dataSource.prefix=\u6570\u636e\u6e90 ''{0}'': {1}
-emport.dataPoint.xid=A \u6570\u636e\u70b9with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.dataPoint.xid=A \u6570\u636e\u70b9with name ''{0}'' does not have an ’xid’ value. Ignored.
 emport.dataPoint.badReference=\u6570\u636e\u70b9with XID ''{0}'' does not already exist and references a\u6570\u636e\u6e90 that does not exist. Ignored.
 emport.dataPoint.prefix=\u6570\u636e\u70b9''{0}'': {1}
 emport.userPermission.prefix=Permissions for user ''{0}'': {1}
 emport.added=added
 emport.saved=saved
 emport.causedBy=caused by:
-emport.view.xid=A graphical view does not have an 'xid' value. Ignored.
+emport.view.xid=A graphical view does not have an ’xid’ value. Ignored.
 emport.view.prefix=View ''{0}'': {1}
 emport.pointHierarchy.prefix=\u70b9\u5c42\u6b21: {0}
-emport.pointLink.xid=A \u70b9\u94fe\u63a5does not have an 'xid' value. Ignored.
+emport.pointLink.xid=A \u70b9\u94fe\u63a5does not have an ’xid’ value. Ignored.
 emport.pointLink.prefix=\u70b9\u94fe\u63a5''{0}'': {1}
 
-eventHandlers.recipTestEmailMessage=\u8fd9\u662f\u6d4b\u8bd5\u90ae\u4ef6\u5173\u4e8e\u4e8b\u4ef6\u5904\u7406\u5668's email recipient list
+eventHandlers.recipTestEmailMessage=\u8fd9\u662f\u6d4b\u8bd5\u90ae\u4ef6\u5173\u4e8e\u4e8b\u4ef6\u5904\u7406\u5668’s email recipient list
 eventHandlers.emailRecipients=Email recipients
-eventHandlers.escalTestEmailMessage=\u8fd9\u662f\u6d4b\u8bd5\u90ae\u4ef6\u5173\u4e8e\u4e8b\u4ef6\u5904\u7406\u5668's escalation list
+eventHandlers.escalTestEmailMessage=\u8fd9\u662f\u6d4b\u8bd5\u90ae\u4ef6\u5173\u4e8e\u4e8b\u4ef6\u5904\u7406\u5668’s escalation list
 eventHandlers.escalRecipients=Escalation recipients
 eventHandlers.noEmailRecips=You must add email recipients
 eventHandlers.escalDelayError=Escalation delay\u5fc5\u987b\u5927\u4e8e0
@@ -1029,8 +1029,7 @@ login.loginButton=\u767b\u5f55
 login.unknownBrowser=\u8bf7\u68c0\u67e5\u60a8\u6d4f\u89c8\u5668\u7684\u517c\u5bb9\u6027...
 login.supportedBrowser=\u672c\u6d4f\u89c8\u5668\u662f\u5b98\u65b9\u652f\u6301\u7684\u3002
 login.unsupportedBrowser=\u60a8\u7684\u6d4f\u89c8\u5668\u53ef\u80fd\u53ef\u4ee5\u6d4f\u89c8\u672c\u7ad9\uff0c\u4f46\u5b83\u4e0d\u662fserosoft\u8f6f\u4ef6\u516c\u53f8\u5b98\u65b9\u652f\u6301\u7684\u6d4f\u89c8\u5668 \u3002\
-\u6211\u4eec\u63a8\u8350\u60a8\u4f7f\u7528 <a href="http://www.mozilla.com/" target="_blank">\u706b\u72d0(Firefox)</a>, Chrome, \u6216\u8005 \
-\u5fae\u8f6f\u7684Internet Explorer 7.
+\u6211\u4eec\u63a8\u8350\u60a8\u4f7f\u7528 Mozilla Firefox, Google Chrome.
 login.nag=\u6ce8\u610f: \u7531\u4e8e\u60a8\u4f7f\u7528\u7684\u6d4f\u89c8\u5668\u4e0d\u5728\u5b98\u65b9\u652f\u6301\u7684\u8303\u56f4\u5185\uff0c\u6240\u4ee5\u8bbf\u95ee\u672c\u7ad9\u53ef\u80fd\u9047\u5230\u4e00\u4e9b\u95ee\u9898\u3002\u8bf7\u5347\u7ea7\u6216\u8005\u66f4\u6362\u6d4f\u89c8\u5668\u3002  
 
 mailingLists.added=\u90ae\u4ef6\u5217\u8868\u5df2\u589e\u52a0
@@ -1062,7 +1061,7 @@ notes.cancel=\u653e\u5f03
 notes.timeByUsername=time\u6839\u636e\u7528\u6237\u540d
 notification.newui.title=New page is available!
 notification.newui.move=Move!
-notification.newui.dontshow=Don't show again.
+notification.newui.dontshow=Don’t show again.
 pointDetails.recordCountError=\u8bb0\u5f55\u6570\u5fc5\u987b\u662f\u4e00\u4e2a\u6570\u5b57
 pointDetails.timePeriodError=\u65f6\u95f4\u95f4\u9694\u5fc5\u987b\u662f\u4e00\u4e2a\u6570\u5b57
 pointDetails.imageCountError=\u6570\u904d\u6570\u5fc5\u987b\u662f\u4e00\u4e2a\u6570\u5b57
@@ -1098,7 +1097,7 @@ pointDetails.accessType=\u8bbf\u95ee\u7c7b\u578b
 pointEdit.buttons.enable=\u6fc0\u6d3b
 pointEdit.buttons.disable=\u7981\u7528
 pointEdit.buttons.restart=\u91cd\u542f
-pointEdit.buttons.note=<span class="smallTitle">\u6ce8\u610f:</span> \u4fdd\u5b58\u3001\u7981\u7528\u3001\u91cd\u542f\u70b9\u5c06\u4f7f\u5176\u544a\u8b66\u4e8b\u4ef6\u7ea7\u522b\u53d8\u4e3a\u666e\u901a
+pointEdit.buttons.note=\u4fdd\u5b58\u3001\u7981\u7528\u3001\u91cd\u542f\u70b9\u5c06\u4f7f\u5176\u544a\u8b66\u4e8b\u4ef6\u7ea7\u522b\u53d8\u4e3a\u666e\u901a
 
 pointEdit.chart.props=\u56fe\u8868\u6e32\u67d3\u5668\u5c5e\u6027
 pointEdit.chart.type=\u7c7b\u578b
@@ -1248,7 +1247,7 @@ pointHierarchySLTS.dataSource=Data source
 pointHierarchySLTS.xid=XID
 pointHierarchySLTS.type=Type
 pointHierarchySLTS.changeOfLanguageFailed=Change of language failed
-pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don't remove data point in root hierarchy
+pointHierarchySLTS.warningDontRemoveDataPointInRoot=Don’t remove data point in root hierarchy
 pointHierarchySLTS.moveDataPointToRoot=Move the element to root level tree
 pointHierarchySLTS.areYouSureToMoveElement=Are you sure to move element?
 pointHierarchySLTS.movedElement=Moved element
@@ -1412,7 +1411,7 @@ scheduledEvents.validate.activeTrigger=\u521b\u5efaactive\u89e6\u53d1\u5668\u65f
 scheduledEvents.validate.inactiveTrigger=\u521b\u5efainactive\u89e6\u53d1\u5668\u65f6\u53d1\u751f\u9519\u8bef\uff1a{0}
 scheduledEvents.validate.aliasTooLong=\u522b\u540d\u4e0d\u80fd\u8d85\u8fc750\u5b57\u7b26
 
-sql.warning=<span class="formError">\u8b66\u544a\uff1a</span> \u4f7f\u7528\u672c\u5de5\u5177\u98ce\u9669\u81ea\u62c5\u3002\u4f7f\u7528\u65b9\u6cd5\u4e0d\u5f97\u5f53\u5c06\u53ef\u80fd\u5bfc\u81f4\u635f\u574f\u7684\u6570\u636e\u6216\u8005\u7cfb\u7edf\u7ea7\u522b\u7684\u9519\u8bef\u3002(\u539f\u56e0\u662fSQL\u76f4\u63a5\u4f5c\u7528\u4e8e\u6570\u636e\u5e93) 
+sql.warning= \u4f7f\u7528\u672c\u5de5\u5177\u98ce\u9669\u81ea\u62c5\u3002\u4f7f\u7528\u65b9\u6cd5\u4e0d\u5f97\u5f53\u5c06\u53ef\u80fd\u5bfc\u81f4\u635f\u574f\u7684\u6570\u636e\u6216\u8005\u7cfb\u7edf\u7ea7\u522b\u7684\u9519\u8bef\u3002(\u539f\u56e0\u662fSQL\u76f4\u63a5\u4f5c\u7528\u4e8e\u6570\u636e\u5e93) 
 sql.sql=SQL
 sql.query=\u63d0\u4ea4\u67e5\u8be2
 sql.update=\u63d0\u4ea4\u66f4\u65b0
@@ -1579,7 +1578,7 @@ viewEdit.compound.duration=\u671f\u95f4
 
 views.title=\u56fe\u5f62\u5316\u89c6\u56fe
 views.newView=\u65b0\u5efa\u89c6\u56fe
-views.noViews=\u672a\u521b\u5efa\u56fe\u5f62\u5316\u89c6\u56fe. <a href="view_edit.shtm">\u9a6c\u4e0a\u521b\u5efa</a>.
+views.noViews=\u672a\u521b\u5efa\u56fe\u5f62\u5316\u89c6\u56fe. 
 
 viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
@@ -1678,7 +1677,7 @@ event.system.pointLink=\u70b9\u7684\u94fe\u63a5\u5931\u8d25
 
 event.audit.added=\u7528\u6237 "{0}" \u5df2\u88ab\u521b\u5efa {1} \u83b7\u5f97\u6807\u8bc6\u4e3a {2}: {3}
 event.audit.changed=\u7528\u6237 "{0}" \u5df2\u88ab\u66f4\u6539 {1} \u5176\u6807\u8bc6\u4e3a {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" -> "{2}"
+event.audit.changedProperty={0}: "{1}" -> "{2}"
 event.audit.compoundEventDetector=\u7ec4\u5408\u4e8b\u4ef6\u4fa6\u5bdf\u5668
 event.audit.dataPoint=\u6570\u636e\u70b9
 event.audit.dataSource=\u6570\u636e\u6e90
@@ -1687,7 +1686,7 @@ event.audit.eventHandler=\u4e8b\u4ef6\u5904\u7406\u5668
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=\u70b9\u4e8b\u4ef6\u4fa6\u5bdf\u5668
 event.audit.pointLink=\u70b9\u7684\u94fe\u63a5
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2003,7 +2002,7 @@ emport.error.eventCode=\u65e0\u6548\u7684\u4e8b\u4ef6\u4ee3\u7801''{0}''\u3002\u
 emport.error.alarmLevel=\u4e8b\u4ef6''{1}''\u7684\u65e0\u6548\u544a\u8b66\u7ea7\u522b''{0}''\u3002\u65e0\u6548\u503c\u4e3a\uff1a{2}
 emport.error.missingUser=\u53eb''{0}''\u540d\u5b57\u7684\u7528\u6237\u6ca1\u6709\u627e\u5230
 emport.error.viewShare.missing=\u89c6\u56fe\u5171\u4eab\u4e2d\u6ca1\u6709''{0}''
-emport.error.component.incompatibleDataType='XID'\u4e3a''{0}''\u7684\u6570\u636e\u70b9\u7684\u5c5e\u6027\u7c7b\u578b\u4e0e\u6570\u636e\u7c7b\u578b''{1}''\u4e0d\u5339\u914d
+emport.error.component.incompatibleDataType=’XID’\u4e3a''{0}''\u7684\u6570\u636e\u70b9\u7684\u5c5e\u6027\u7c7b\u578b\u4e0e\u6570\u636e\u7c7b\u578b''{1}''\u4e0d\u5339\u914d
 emport.error.compound.invalidChildId=\u7c7b\u578b\u4e3a''{1}''\u7684\u7ec4\u5408\u89c6\u56fe\u7ec4\u4ef6\u7684\u5b50id''{0}''\u65e0\u6548\u3002\u6709\u6548\u7684id\u4e3a\uff1a{2}
 emport.error.component.unknownDynamicImage=id\u4e3a''{0}''\u7684\u52a8\u6001\u56fe\u6ca1\u6709\u53d1\u73b0\u3002\u5df2\u77e5\u7684\u52a8\u6001\u56feid\u5982\u4e0b\uff1a{1}
 emport.error.component.unknownImageSet=id\u4e3a''{0}''\u7684\u56fe\u7247\u96c6\u5408\u6ca1\u6709\u53d1\u73b0\u3002\u5df2\u77e5\u7684\u56fe\u7247\u96c6\u5408id\u5982\u4e0b\uff1a{1}
@@ -2450,7 +2449,7 @@ publisherEdit.persistent.status.connectionState=Connection\: {0}
 emport.maintenanceEvent.prefix=Maintenance event ''{0}''\: {1}
 dox.internalDS=Internal Data Source
 systemSettings.instanceId=Instance ID
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 eventHandlers.activeScript=When active script
 dsEdit.mbus.addressHex=Address
 dsEdit.mbus.manufacturer=Manufacturer
@@ -2488,9 +2487,9 @@ engUnit.abbr.5=V
 engUnit.abbr.4=ohms
 engUnit.abbr.3=A
 engUnit.abbr.2=mA
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.1=ft\u00b2
 graphic.enhancedImageChart.pointConfig.showPoints=Display points of measure\:
-engUnit.abbr.0=m<sup>2</sup>
+engUnit.abbr.0=m\u00b2
 scripts.objectsContext=Context objects
 dsEdit.radiuino.radiuinoDataType.2bUnsigned=Integer (unsigned 2 bytes)
 dsEdit.iec101Ethernet=IEC101 Ethernet
@@ -2508,7 +2507,7 @@ event.pachube.dataStreamNotFound=Data stream "{0}" in feed {1} not found or has
 dsEdit.asciiSerial.timeout=Timeout (ms)
 dsEdit.openv4j.dataPointSettable=Setable
 maintenanceEvents.addMe=Add maintenance event
-emport.publisher.xid=A data source with name ''{0}'' does not have an 'xid' value. Ignored.
+emport.publisher.xid=A data source with name ''{0}'' does not have an ’xid’ value. Ignored.
 dsEdit.asciiSerial=ASCII Serial
 dsEdit.mbus.firstHexAddress=From Address (Hex)
 dsEdit.modbusIp.socketPointName=TCP socket monitoring
@@ -2604,7 +2603,7 @@ publisherEdit.persistent.startSync=Synchronize history
 dsEdit.radiuino.desc=Radiuino Properties
 graphic.button=ON/OFF Button
 dsEdit.openv4j.device=Device
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
+dsEdit.viconics.chipRevisionBr=Chip revision
 dox.importProject=Importing projects
 events.search.maxResults=Max results
 dox.pachubeDS=Pachube data source
@@ -2664,7 +2663,7 @@ publisherEdit.pachube.retries=Retries
 maintenanceEvents.schedule.manual={0} - Manual
 dsEdit.persistent.dsconn=Port\: {0}
 emport.error.eventType.missing.reference=Event type must have a ''{0}''
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 pointEdit.props.deviceName=Device Name
 dsEdit.alpha2.station=Station
 dsEdit.dnp3.minIndex=Min index
@@ -2863,7 +2862,7 @@ engUnit.abbr.133=hectopascals
 engUnit.abbr.132=milliwatts
 engUnit.abbr.131=per hour
 engUnit.abbr.130=megahertz
-emport.compoundEvent.xid=A compound event detector does not have an 'xid' value. Ignored.
+emport.compoundEvent.xid=A compound event detector does not have an ’xid’ value. Ignored.
 engUnit.139=megajoules per square meter
 engUnit.138=kilowatt hours per square foot
 engUnit.137=kilowatt hours per square meter
@@ -3072,11 +3071,11 @@ engUnit.41=tons
 dsEdit.dnp3.validate.indexUsed=Index already in use
 engUnit.40=pounds mass
 publisherEdit.pachube.point.feedId=Feed ID
-emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid 'type' value of ''{1}''. Valid types are {2}
+emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist and has an invalid ’type’ value of ''{1}''. Valid types are {2}
 dsEdit.pachube.timeout=Timeout (seconds)
 common.confirmDelete=Are you sure you want delete?
 dsEdit.modbus.maxReadBitCount=Max read bit count
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 scripts.seDetails=Script details
 dsedit.opc.tagName=Tag Tag
 dsEdit.modbus.modbusDataType.varchar=Variable length string
@@ -3169,7 +3168,7 @@ dsEdit.opc=OPC DA
 dsEdit.drStorageHt5b.pointType=Point Type
 events.listed={0} event(s) listed
 events.ackedByDeletedUser=- (deleted user)
-eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler's inactive list
+eventHandlers.inactiveTestEmailMessage=This message was sent as a test of an event handler’s inactive list
 dsEdit.jmx.addPoint=Add point
 dsEdit.asciiSerial.charStopMode.charASCII=ASCII character
 dsEdit.radiuino.offset=Offset
@@ -3178,7 +3177,7 @@ dsEdit.openv4j.desc=OpenV4J properties
 userProfiles.validate.successDeleting=Profile successfully deleted.
 dsEdit.alpha2.deviceCode.commWordDevice=Comm Word Device
 dox.asciiFileReaderPP=ASCII File Reader PP
-emport.mailingList.xid=A mailing list does not have an 'xid' value. Ignored.
+emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
 aphic.simpleCompound.leadPoint=Lead Point
 graphic.enhancedPoint=Enhanced point
 maintenanceEvents.meDisabled=Disabled maintenance event
@@ -3212,7 +3211,7 @@ dsEdit.internal.attr.BATCH_ENTRIES=Point values to be written
 event.pb.persistent.syncCompleted=Synchronization completed
 publisherEdit.httpSender.dateFormat=Date format
 scripts.se=Script
-emport.watchList.xid=A watch list does not have an 'xid' value. Ignored.
+emport.watchList.xid=A watch list does not have an ’xid’ value. Ignored.
 systemSettings.contentType.html=HTML only
 dsEdit.mbus.search=Search
 dsEdit.opc.validate.dataSourceNotSaved=You must first save the data source
@@ -3232,14 +3231,14 @@ dox.scriptDPObject=Data Point Context Object
 dox.opcDS=Data Source OPC
 dsEdit.modbus.locatorTestIp.startError=There was a problem testing the locator. ({0})
 publisherEdit.persistent=Serotonin Persistent TCP
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.commAddress=Comm address
 dsEdit.openv4j.dataPoint=Datapoint
 dsEdit.mbus.addPoint=add
 validate.between=Must be between {0} and {1}
 dsEdit.iec101.dpconn=TypeId {0}, IOA {1}
 dsEdit.jmx.attributeNotComposite=Attribute ''{0}'' in ''{1}'' is not composite
 maintenanceEvents.validate.inactiveCron=Error in inactive cron expression\: {0}
-emport.scheduledEvent.xid=A scheduled event does not have an 'xid' value. Ignored.
+emport.scheduledEvent.xid=A scheduled event does not have an ’xid’ value. Ignored.
 emport.error.eventHandler.invalid=Event handler has an invalid ''{0}'' value of ''{1}''. Valid values are {2}
 dsEdit.viconics.channel=Channel
 dsEdit.mbus.useDirectConnection=Direct connection
@@ -3302,7 +3301,7 @@ dsEdit.mbus.vifeLabels=Vife labels
 pointDetails.pointNotFound=Point not found
 dsEdit.asciiSerial.baud=Baud rate
 dox.radiuinoPP=Radiuino data point 
-emport.eventHandler.xid=A point link does not have an 'xid' value. Ignored.
+emport.eventHandler.xid=A point link does not have an ’xid’ value. Ignored.
 dsEdit.bacnetIp.objectList=Device object list
 dsEdit.mbus.responseFrame=Frame
 engUnitGroup.length=Length
@@ -3330,7 +3329,7 @@ dsEdit.modbus.dpconn3=Connection monitoring
 dsEdit.modbus.dpconn2=Slave id {0} monitor
 graphic.enhancedImageChart.pointConfig.renderMode=Render mode\:
 dsEdit.serial.parity.space=Space
-emport.maintenanceEvent.xid=A maintenance event does not have an 'xid' value. Ignored.
+emport.maintenanceEvent.xid=A maintenance event does not have an ’xid’ value. Ignored.
 dsEdit.openv4j.refreshStopped=Update finished
 dsEdit.internal.attr.MONITOR_STACK_HEIGHT=Maximum thread stack height
 dsEdit.viconics.port=Port
@@ -3368,7 +3367,7 @@ dsEdit.opc.tagName=Tag Name
 graphic.link=Link
 eventHandlers.inactiveOverride=Override inactive recipients
 dsEdit.bacnetIp.remoteDeviceNetworkNumber=Network Number
-emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a 'type' value. Valid types are {1}
+emport.publisher.missingType=Publisher with XID ''{0}'' does not already exist and does not have a ’type’ value. Valid types are {1}
 dsEdit.alpha2.deviceCode.commBitDevice=Comm Bit Device
 dsEdit.mbus.tcpIpBitPerSecond=Baudrate
 dox.jmxDS=JMX Data Source
@@ -3380,7 +3379,7 @@ maintenanceEvents.toggle.disabled=Cannot toggle. Event is currently disabled.
 maintenanceEvents.validate.activeCron=Error in active cron expression\: {0}
 dsEdit.bacnetIp.remoteDeviceInstanceNumber=Remote device instance number
 dsEdit.nodaves7.s7writeBytesQty=Bytes quantity
-emport.versionError=The project version ({0}) isn't compatible with current system version ({1})
+emport.versionError=The project version ({0}) isn’t compatible with current system version ({1})
 publisherEdit.persistent.sync.none=None
 dsEdit.dnp3Serial.baud=Baud rate
 eventHandlers.noInactiveRecips=You must add inactive recipients
@@ -3409,7 +3408,7 @@ dsEdit.asciiFile.checkFile=Check
 event.persistent.xidTooLong=XID of "{0}" point is too long.
 event.viconics.duplicateCommException=Duplicate comm address detected\: {0}
 dsEdit.drStorageHt5b.type.Temperature=Temperature
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.dnp3.binaryInput=Binary Input
 dsEdit.jmx.getObjectNames=Get object names
 dox.colours=Color
@@ -3427,16 +3426,48 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
-annotation.unknown=Unknow
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
+annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
-annotation.api=REST API
\ No newline at end of file
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
+annotation.api=REST API
+pointEdit.buttons.note.prefix=\u6ce8\u610f:
+sql.warning.prefix=\u8b66\u544a\uff1a:
+views.noViews.prefix=\u9a6c\u4e0a\u521b\u5efa.
+dsEdit.sql.statementLimit=Statement limit
+dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
+event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
+event.script.failure=Failed execute script: "{0}", Message: "{1}"
+event.system.sms=Sms send failure
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom CSS has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
\ No newline at end of file
diff --git a/test/org/scada_lts/dao/EventServiceTest.java b/test/org/scada_lts/dao/EventServiceTest.java
index 0675046707..4d9e59e2b2 100644
--- a/test/org/scada_lts/dao/EventServiceTest.java
+++ b/test/org/scada_lts/dao/EventServiceTest.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Properties;
 
+import com.serotonin.mango.vo.User;
 import org.junit.Before;
 import org.junit.Test;
 import org.scada_lts.config.ScadaConfig;
@@ -109,9 +110,12 @@ public void ackEvent() {
 		int alarmLevel = 3;
 		EventInstance e = new EventInstance(type, activeTS,	applicable, alarmLevel, null, null);
 		eventService.saveEvent(e);
+
+		User user = new User();
+		user.setId(ADMIN_USER_ID);
 		
 		long currentTime = System.currentTimeMillis();
-		eventService.ackEvent(e.getId(), currentTime, ADMIN_USER_ID, -1, false);
+		eventService.ackEvent(e, currentTime, user, -1, false);
 		List<EventInstance> lstAckEvents = eventService.getActiveEvents();
 		boolean checkAckEvent = lstAckEvents.get(0).getAcknowledgedTimestamp() == currentTime;
 		
@@ -128,9 +132,12 @@ public void ackEventSingleAlarmLevelChange() {
 		int alarmLevel = 3;
 		EventInstance e = new EventInstance(type, activeTS,	applicable, alarmLevel, null, null);
 		eventService.saveEvent(e);
+
+		User user = new User();
+		user.setId(ADMIN_USER_ID);
 		
 		long currentTime = System.currentTimeMillis();
-		eventService.ackEvent(e.getId(), currentTime, ADMIN_USER_ID, -1);
+		eventService.ackEvent(e, currentTime, user, -1);
 		List<EventInstance> lstAckEvents = eventService.getActiveEvents();
 		boolean checkAckEventSingleAlarmLevelChange = lstAckEvents.size() == 1;
 		
@@ -540,8 +547,11 @@ public void toggleSilence() {
 		
 		UserEventDAO userEventDAO = new UserEventDAO();
 		userEventDAO.create(userEvent);
+
+		User user = new User();
+		user.setId(ADMIN_USER_ID);
 		
-		eventService.toggleSilence(e.getId(), ADMIN_USER_ID);
+		eventService.toggleSilence(e, user);
 		
 		List<EventInstance> events = eventService.searchOld(e.getId(),EventType.EventSources.DATA_SOURCE,"*",alarmLevel,null,0,ADMIN_USER_ID,null);		
 		
diff --git a/test/org/scada_lts/dao/PointValueDAOTest.java b/test/org/scada_lts/dao/PointValueDAOTest.java
index 92474d024b..0197dfede2 100644
--- a/test/org/scada_lts/dao/PointValueDAOTest.java
+++ b/test/org/scada_lts/dao/PointValueDAOTest.java
@@ -1,9 +1,8 @@
 package org.scada_lts.dao;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import com.serotonin.mango.rt.dataImage.AnnotatedPointValueTime;
 import com.serotonin.mango.vo.User;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/test/org/scada_lts/ds/messaging/channel/MessagingChannelsMultiThreadTest.java b/test/org/scada_lts/ds/messaging/channel/MessagingChannelsMultiThreadTest.java
index 77e3e1f700..667825bcf0 100644
--- a/test/org/scada_lts/ds/messaging/channel/MessagingChannelsMultiThreadTest.java
+++ b/test/org/scada_lts/ds/messaging/channel/MessagingChannelsMultiThreadTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.ds.messaging.channel;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import com.serotonin.mango.rt.dataImage.DataPointRT;
 import com.serotonin.mango.vo.DataPointVO;
 import org.junit.Assert;
diff --git a/test/org/scada_lts/ds/messaging/channel/MessagingChannelsTest.java b/test/org/scada_lts/ds/messaging/channel/MessagingChannelsTest.java
index d3a52b680c..a23e20bdcc 100644
--- a/test/org/scada_lts/ds/messaging/channel/MessagingChannelsTest.java
+++ b/test/org/scada_lts/ds/messaging/channel/MessagingChannelsTest.java
@@ -1,14 +1,11 @@
 package org.scada_lts.ds.messaging.channel;
 
-import br.org.scadabr.db.utils.TestUtils;
 import com.serotonin.mango.rt.dataImage.DataPointRT;
-import com.serotonin.mango.vo.DataPointVO;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import utils.mock.MockUtils;
 
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/test/org/scada_lts/mango/service/UsersProfileServiceTest.java b/test/org/scada_lts/mango/service/UsersProfileServiceTest.java
index ca57a0b010..dd6cfe466d 100644
--- a/test/org/scada_lts/mango/service/UsersProfileServiceTest.java
+++ b/test/org/scada_lts/mango/service/UsersProfileServiceTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.mango.service;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import br.org.scadabr.vo.permission.ViewAccess;
 import br.org.scadabr.vo.permission.WatchListAccess;
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
diff --git a/test/org/scada_lts/permissions/migration/DataPointMigrationPermissionsCommandTest.java b/test/org/scada_lts/permissions/migration/DataPointMigrationPermissionsCommandTest.java
index 77b9934d14..ad6ece5eb6 100644
--- a/test/org/scada_lts/permissions/migration/DataPointMigrationPermissionsCommandTest.java
+++ b/test/org/scada_lts/permissions/migration/DataPointMigrationPermissionsCommandTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.permissions.migration;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import br.org.scadabr.vo.permission.ViewAccess;
 import br.org.scadabr.vo.permission.WatchListAccess;
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
diff --git a/test/org/scada_lts/permissions/migration/DataSourceMigrationPermissionsCommandTest.java b/test/org/scada_lts/permissions/migration/DataSourceMigrationPermissionsCommandTest.java
index afd87d27cc..9471597483 100644
--- a/test/org/scada_lts/permissions/migration/DataSourceMigrationPermissionsCommandTest.java
+++ b/test/org/scada_lts/permissions/migration/DataSourceMigrationPermissionsCommandTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.permissions.migration;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import br.org.scadabr.vo.permission.ViewAccess;
 import br.org.scadabr.vo.permission.WatchListAccess;
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
diff --git a/test/org/scada_lts/permissions/migration/MigrationPermissionsUtilsTest.java b/test/org/scada_lts/permissions/migration/MigrationPermissionsUtilsTest.java
index 0ca753b075..cafd549df4 100644
--- a/test/org/scada_lts/permissions/migration/MigrationPermissionsUtilsTest.java
+++ b/test/org/scada_lts/permissions/migration/MigrationPermissionsUtilsTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.permissions.migration;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import br.org.scadabr.vo.usersProfiles.UsersProfileVO;
 import com.serotonin.mango.view.ShareUser;
 import com.serotonin.mango.view.View;
diff --git a/test/org/scada_lts/permissions/service/util/UpdateDataPointUserPermissionsTest.java b/test/org/scada_lts/permissions/service/util/UpdateDataPointUserPermissionsTest.java
index 051519a3de..f8050e5f1c 100644
--- a/test/org/scada_lts/permissions/service/util/UpdateDataPointUserPermissionsTest.java
+++ b/test/org/scada_lts/permissions/service/util/UpdateDataPointUserPermissionsTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.permissions.service.util;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.permission.DataPointAccess;
 import org.junit.Test;
diff --git a/test/org/scada_lts/permissions/service/util/UpdateDataSourceUserPermissionsTest.java b/test/org/scada_lts/permissions/service/util/UpdateDataSourceUserPermissionsTest.java
index ecec676bfe..4258f03965 100644
--- a/test/org/scada_lts/permissions/service/util/UpdateDataSourceUserPermissionsTest.java
+++ b/test/org/scada_lts/permissions/service/util/UpdateDataSourceUserPermissionsTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.permissions.service.util;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import com.serotonin.mango.vo.User;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/test/org/scada_lts/serorepl/utils/TruncateStringUtilsExceptionTest.java b/test/org/scada_lts/serorepl/utils/TruncateStringUtilsExceptionTest.java
index 07792e276e..ce5d2ced81 100644
--- a/test/org/scada_lts/serorepl/utils/TruncateStringUtilsExceptionTest.java
+++ b/test/org/scada_lts/serorepl/utils/TruncateStringUtilsExceptionTest.java
@@ -7,7 +7,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static br.org.scadabr.db.utils.TestUtils.*;
+import static utils.TestUtils.*;
 
 @RunWith(Parameterized.class)
 public class TruncateStringUtilsExceptionTest {
diff --git a/test/org/scada_lts/serorepl/utils/TruncateStringUtilsTest.java b/test/org/scada_lts/serorepl/utils/TruncateStringUtilsTest.java
index 46b0415e2c..67a02cb945 100644
--- a/test/org/scada_lts/serorepl/utils/TruncateStringUtilsTest.java
+++ b/test/org/scada_lts/serorepl/utils/TruncateStringUtilsTest.java
@@ -7,7 +7,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static br.org.scadabr.db.utils.TestUtils.*;
+import static utils.TestUtils.*;
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)
diff --git a/test/org/scada_lts/service/pointhierarchy/GetPointHierarchyByKeyTest.java b/test/org/scada_lts/service/pointhierarchy/GetPointHierarchyByKeyTest.java
index bbc500e108..b1eb72bef9 100644
--- a/test/org/scada_lts/service/pointhierarchy/GetPointHierarchyByKeyTest.java
+++ b/test/org/scada_lts/service/pointhierarchy/GetPointHierarchyByKeyTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.service.pointhierarchy;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import com.serotonin.mango.view.ShareUser;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
@@ -22,7 +22,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.scada_lts.permissions.migration.MigrationPermissionsUtils.generateDataPointAccess;
-import static org.scada_lts.utils.PointHierarchyUtils.sort;
 
 public class GetPointHierarchyByKeyTest {
 
diff --git a/test/org/scada_lts/service/pointhierarchy/GetPointHierarchyRootTest.java b/test/org/scada_lts/service/pointhierarchy/GetPointHierarchyRootTest.java
index a52fd81e0e..aacea81fc3 100644
--- a/test/org/scada_lts/service/pointhierarchy/GetPointHierarchyRootTest.java
+++ b/test/org/scada_lts/service/pointhierarchy/GetPointHierarchyRootTest.java
@@ -1,6 +1,6 @@
 package org.scada_lts.service.pointhierarchy;
 
-import br.org.scadabr.db.utils.TestUtils;
+import utils.TestUtils;
 import com.serotonin.mango.view.ShareUser;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
@@ -13,7 +13,6 @@
 import org.scada_lts.dao.HierarchyDAO;
 import org.scada_lts.dao.model.pointhierarchy.PointHierarchyNode;
 import org.scada_lts.dao.pointhierarchy.PointHierarchyXidDAO;
-import org.scada_lts.utils.PointHierarchyUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/test/org/scada_lts/utils/CyclicDependencyValidationUtilsTest.java b/test/org/scada_lts/utils/CyclicDependencyValidationUtilsTest.java
new file mode 100644
index 0000000000..503e179251
--- /dev/null
+++ b/test/org/scada_lts/utils/CyclicDependencyValidationUtilsTest.java
@@ -0,0 +1,115 @@
+package org.scada_lts.utils;
+
+import com.serotonin.db.IntValuePair;
+import org.junit.BeforeClass;
+import utils.TestUtils;
+import com.serotonin.mango.vo.DataPointVO;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(Parameterized.class)
+public class CyclicDependencyValidationUtilsTest {
+
+    @Parameterized.Parameters(name = "{index}: starDataPointId: {0}, findDataPointId: {1}, cyclicDependency: {2}")
+    public static Object[][] data() {
+        return new Object[][] {
+                { 1, 1, true },
+                { 2, 1, false },
+                { 3, 1, false },
+                { 4, 1, false },
+                { 5, 1, false },
+                { 6, 1, false },
+                { 1, 2, true },
+                { 2, 2, true },
+                { 3, 2, true },
+                { 4, 2, true },
+                { 5, 2, false },
+                { 6, 2, false },
+                { 1, 3, true },
+                { 2, 3, true },
+                { 3, 3, true },
+                { 4, 3, true },
+                { 5, 3, false },
+                { 6, 3, false },
+                { 1, 4, true },
+                { 2, 4, true },
+                { 3, 4, true },
+                { 4, 4, true },
+                { 5, 4, false },
+                { 6, 4, false },
+                { 1, 5, false },
+                { 2, 5, false },
+                { 3, 5, false },
+                { 4, 5, false },
+                { 5, 5, true },
+                { 6, 5, true },
+                { 1, 6, false },
+                { 2, 6, false },
+                { 3, 6, false },
+                { 4, 6, false },
+                { 5, 6, false },
+                { 6, 6, true }
+        };
+    }
+    private final int starDataPointId;
+    private final int findDataPointId;
+    private final boolean cyclicDependencyExpected;
+
+    public CyclicDependencyValidationUtilsTest(int starDataPointId, int findDataPointId, boolean cyclicDependency) {
+        this.starDataPointId = starDataPointId;
+        this.findDataPointId = findDataPointId;
+        this.cyclicDependencyExpected = cyclicDependency;
+    }
+
+    private static Map<Integer, DataPointVO> DATA_POINTS;
+
+    @BeforeClass
+    public static void config() {
+        List<IntValuePair> context1 = new ArrayList<>();
+        context1.add(new IntValuePair(2, "p2"));
+        context1.add(new IntValuePair(3, "p3"));
+        context1.add(new IntValuePair(4, "p4"));
+
+        List<IntValuePair> context2 = new ArrayList<>();
+        context2.add(new IntValuePair(3, "p3"));
+
+        List<IntValuePair> context3 = new ArrayList<>();
+        context3.add(new IntValuePair(4, "p4"));
+
+        List<IntValuePair> context4 = new ArrayList<>();
+        context4.add(new IntValuePair(2, "p2"));
+
+        List<IntValuePair> context5 = new ArrayList<>();
+        context5.add(new IntValuePair(5, "p5"));
+
+        DataPointVO dataPoint1 = TestUtils.newMetaPointSettable(1, -1, context1);
+        DataPointVO dataPoint2 = TestUtils.newMetaPointSettable(2, -1, context2);
+        DataPointVO dataPoint3 = TestUtils.newMetaPointSettable(3, -1, context3);
+        DataPointVO dataPoint4 = TestUtils.newMetaPointSettable(4, -1, context4);
+        DataPointVO dataPoint5 = TestUtils.newMetaPointSettable(5, -1, new ArrayList<>());
+        DataPointVO dataPoint6 = TestUtils.newMetaPointSettable(6, -1, context5);
+
+        DATA_POINTS = Map.of(dataPoint1.getId(), dataPoint1,
+                dataPoint2.getId(), dataPoint2,
+                dataPoint3.getId(), dataPoint3,
+                dataPoint4.getId(), dataPoint4,
+                dataPoint5.getId(), dataPoint5,
+                dataPoint6.getId(), dataPoint6);
+    }
+
+    @Test
+    public void when_isCyclicDependency() {
+
+        //when:
+        boolean cyclicDependencyResult = ValidationUtils.isCyclicDependency(starDataPointId, findDataPointId, DATA_POINTS, 10);
+
+        //then:
+        Assert.assertEquals(cyclicDependencyExpected, cyclicDependencyResult);
+    }
+}
\ No newline at end of file
diff --git a/test/org/scada_lts/utils/ThreadPoolExecutorConfigSystemSettingsUtilsTest.java b/test/org/scada_lts/utils/ThreadPoolExecutorConfigSystemSettingsUtilsTest.java
index c8c2543ea7..0b39513641 100644
--- a/test/org/scada_lts/utils/ThreadPoolExecutorConfigSystemSettingsUtilsTest.java
+++ b/test/org/scada_lts/utils/ThreadPoolExecutorConfigSystemSettingsUtilsTest.java
@@ -1,12 +1,22 @@
 package org.scada_lts.utils;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.maint.work.AbstractBeforeAfterWorkItem;
 import com.serotonin.mango.rt.maint.work.WorkItemPriority;
 import com.serotonin.mango.web.ContextWrapper;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.quartz.ItemsPerSecond;
+import org.scada_lts.web.beans.ApplicationBeans;
 
 import javax.servlet.ServletContext;
 
@@ -18,7 +28,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(Parameterized.class)
+@RunWith(PowerMockRunner.class)
+@PowerMockRunnerDelegate(Parameterized.class)
+@PrepareForTest({ApplicationBeans.class})
+// resources/org/powermock/extensions/configuration.properties is not working
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*",
+        "javax.activation.*", "javax.management.*"})
 public class ThreadPoolExecutorConfigSystemSettingsUtilsTest {
 
 
@@ -56,6 +71,9 @@ public void config() {
         when(servletContext.getRealPath("")).thenReturn("test/");
         when(contextWrapper.getServletContext()).thenReturn(servletContext);
         Common.ctx = contextWrapper;
+        ObjectMapper objectMapper = new ObjectMapper();
+        PowerMockito.mockStatic(ApplicationBeans.class);
+        when(ApplicationBeans.getObjectMapper()).thenReturn(objectMapper);
     }
 
     @Test
diff --git a/test/org/scada_lts/utils/UpdateValuePointPropertiesTest.java b/test/org/scada_lts/utils/UpdateValuePointPropertiesTest.java
index adf17bf931..9fe5b57935 100644
--- a/test/org/scada_lts/utils/UpdateValuePointPropertiesTest.java
+++ b/test/org/scada_lts/utils/UpdateValuePointPropertiesTest.java
@@ -2,9 +2,6 @@
 
 import com.serotonin.bacnet4j.type.enumerated.EngineeringUnits;
 import com.serotonin.mango.Common;
-import com.serotonin.mango.DataTypes;
-import com.serotonin.mango.rt.event.AlarmLevels;
-import com.serotonin.mango.view.ImplDefinition;
 import com.serotonin.mango.view.chart.ChartRenderer;
 import com.serotonin.mango.view.chart.StatisticsChartRenderer;
 import com.serotonin.mango.view.chart.TableChartRenderer;
diff --git a/test/org/scada_lts/web/beans/validation/css/CssValidatorExceptionTest.java b/test/org/scada_lts/web/beans/validation/css/CssValidatorExceptionTest.java
new file mode 100644
index 0000000000..4d521bf59c
--- /dev/null
+++ b/test/org/scada_lts/web/beans/validation/css/CssValidatorExceptionTest.java
@@ -0,0 +1,39 @@
+package org.scada_lts.web.beans.validation.css;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.scada_lts.web.beans.validation.ScadaValidator;
+import org.scada_lts.web.beans.validation.ScadaValidatorException;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+@RunWith(Parameterized.class)
+public class CssValidatorExceptionTest {
+
+    @Parameterized.Parameters(name = "{index}: CSS: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {"body { color: ; }"},
+                {"#id { background-color: #ggg; }"},
+                {"div { margin; }"},
+                {"@media screen and (max-width: 600px) { h1 { font-size: 30px }"},
+                {"body { color red; }"},
+                {"\"><img src=x onerror=alert(document.location)>"},
+        });
+    }
+
+    private final String css;
+    public final ScadaValidator<String> validator;
+
+    public CssValidatorExceptionTest(String css) {
+        this.css = css;
+        this.validator = new SacCssValidator();
+    }
+
+    @Test(expected = CssValidatorException.class)
+    public void when_isInvalidCss() throws ScadaValidatorException {
+        validator.validate(css);
+    }
+}
diff --git a/test/org/scada_lts/web/beans/validation/css/CssValidatorTest.java b/test/org/scada_lts/web/beans/validation/css/CssValidatorTest.java
new file mode 100644
index 0000000000..ff5f6efbc6
--- /dev/null
+++ b/test/org/scada_lts/web/beans/validation/css/CssValidatorTest.java
@@ -0,0 +1,39 @@
+package org.scada_lts.web.beans.validation.css;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.scada_lts.web.beans.validation.ScadaValidator;
+import org.scada_lts.web.beans.validation.ScadaValidatorException;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+@RunWith(Parameterized.class)
+public class CssValidatorTest {
+
+    @Parameterized.Parameters(name = "{index}: CSS: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {"body { color: red; }"},
+                {"h1 { font-size: 20px; }"},
+                {"#id { background-color: #fff; }"},
+                {"div { margin: 0 auto; padding: 10px; }"},
+                {".class { border: 1px solid black; }"},
+                {"p { line-height: 1.5; }"},
+        });
+    }
+
+    private final String css;
+    public final ScadaValidator<String> validator;
+
+    public CssValidatorTest(String css) {
+        this.css = css;
+        this.validator = new SacCssValidator();
+    }
+
+    @Test
+    public void when_isValidCss() throws ScadaValidatorException {
+        validator.validate(css);
+    }
+}
diff --git a/test/org/scada_lts/web/beans/validation/css/CssValidatorTestsSuite.java b/test/org/scada_lts/web/beans/validation/css/CssValidatorTestsSuite.java
new file mode 100644
index 0000000000..327e00eda8
--- /dev/null
+++ b/test/org/scada_lts/web/beans/validation/css/CssValidatorTestsSuite.java
@@ -0,0 +1,12 @@
+package org.scada_lts.web.beans.validation.css;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        CssValidatorTest.class,
+        CssValidatorExceptionTest.class
+})
+public class CssValidatorTestsSuite {
+}
diff --git a/test/org/scada_lts/web/beans/validation/xss/XssValidatorExceptionTest.java b/test/org/scada_lts/web/beans/validation/xss/XssValidatorExceptionTest.java
new file mode 100644
index 0000000000..c46ea4647d
--- /dev/null
+++ b/test/org/scada_lts/web/beans/validation/xss/XssValidatorExceptionTest.java
@@ -0,0 +1,73 @@
+package org.scada_lts.web.beans.validation.xss;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.scada_lts.web.beans.validation.ScadaValidator;
+import org.scada_lts.web.beans.validation.ScadaValidatorException;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+@RunWith(Parameterized.class)
+public class XssValidatorExceptionTest {
+
+    @Parameterized.Parameters(name = "{index}: input: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {
+                {"<script>alert(1)</script>"},
+                {"<a href=\"javascript:alert(1)\">Link</a>"},
+                {"<div onclick=\"alert(1)\">Click me</div>"},
+                {"body { background-image: url('\"><img src=x onerror=alert(document.location)>'); }"},
+                {"div { content: \"<script>alert('XSS')</script>\"; }"},
+                {"h1 { font-family: \"<img src=x onerror=alert('XSS')>\"; }"},
+                {"@import url(\"javascript:alert('XSS')\");"},
+                {"div { /* comment: <img src=x onerror=alert('XSS')> */ }"},
+                {"span { content: '\"><script>alert(1)</script>'; }"},
+                {"h2 { color: expression(alert('XSS')); }"},
+                {"\"><img src=x onerror=alert(document.location)>"},
+                {"<img src='x' onerror='alert(1)'>"},
+                {"<input type=\"text\" value=\"\" onfocus=\"alert(1)\">"},
+                {"<iframe src=\"javascript:alert(1)\"></iframe>"},
+                {"<form action=\"javascript:alert(1)\"><input type=\"submit\"></form>"},
+                {"<object data=\"javascript:alert(1)\"></object>"},
+                {"<embed src=\"javascript:alert(1)\">"},
+                {"<base href=\"javascript:alert(1)//\">"},
+                {"<svg onload=\"alert(1)\">"},
+                {"<svg><script>alert(1)</script></svg>"},
+                {"<math><a xlink:href=\"javascript:alert(1)\">XSS</a></math>"},
+                {"<img src=x onerror=\"alert(String.fromCharCode(88,83,83))\">"},
+                {"<b onmouseover=\"alert(1)\">XSS</b>"},
+                {"<video><source onerror=\"javascript:alert(1)\"></video>"},
+                {"<details open ontoggle=\"alert(1)\">"},
+                {"<input onfocus=\"alert('XSS')\">"},
+                {"<div style=\"width: expression(alert('XSS'))\">"},
+                {"<meta http-equiv=\"refresh\" content=\"0;url=javascript:alert(1)\">"},
+                {"<link rel=\"stylesheet\" href=\"javascript:alert(1)\">"},
+                {"<textarea onfocus=\"alert(1)\"></textarea>"},
+                {"<a href=\"//example.com\" onclick=\"alert(1)\">Link</a>"},
+                {"<button onclick=\"alert(1)\">Click me</button>"},
+                {"<div style=\"background-image: url(javascript:alert(1))\">XSS</div>"},
+                {"<audio src=\"javascript:alert(1)\"></audio>"},
+                {"<marquee onstart=\"alert(1)\">XSS</marquee>"},
+                {"<keygen autofocus onfocus=\"alert(1)\">"},
+                {"<command onclick=\"alert(1)\">Click me</command>"},
+                {"<img src=\"https://example.com/image.jpg\" alt=\"Example Image\" width=\"600\" height=\"400\" border=\"0\" />"},
+                {"<img src=\"http://example.com/image.jpg\" alt=\"Example Image\" width=\"600\" height=\"400\" border=\"0\" />"},
+                {"><img src=x onerror=alert(document.location)>"},
+        });
+    }
+
+    private final String input;
+    private final ScadaValidator<String> validator;
+
+    public XssValidatorExceptionTest(String input) {
+        this.input = input;
+        this.validator = new XssValidator();
+    }
+
+    @Test(expected = XssValidatorException.class)
+    public void when_isInvalidXss() throws ScadaValidatorException {
+        validator.validate(input);
+    }
+}
diff --git a/test/org/scada_lts/web/beans/validation/xss/XssValidatorTest.java b/test/org/scada_lts/web/beans/validation/xss/XssValidatorTest.java
new file mode 100644
index 0000000000..960886b6c7
--- /dev/null
+++ b/test/org/scada_lts/web/beans/validation/xss/XssValidatorTest.java
@@ -0,0 +1,57 @@
+package org.scada_lts.web.beans.validation.xss;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.scada_lts.web.beans.validation.ScadaValidator;
+import org.scada_lts.web.beans.validation.ScadaValidatorException;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+@RunWith(Parameterized.class)
+public class XssValidatorTest {
+
+    @Parameterized.Parameters(name = "{index}: input: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {null},
+                {""},
+                {"<b>Bold</b>"},
+                {"Hello, World!"},
+                {"<i>Italic text</i>"},
+                {"<u>Underlined</u>"},
+                {"<strong>Strong text</strong>"},
+                {"<em>Emphasized text</em>"},
+                {"<p>Paragraph with <b>bold</b> and <i>italic</i></p>"},
+                {"<ul><li>Item 1</li><li>Item 2</li></ul>"},
+                {"<ol><li>First</li><li>Second</li></ol>"},
+                {"body { font-size: 14px; }"},
+                {"h1 { font-weight: bold; }"},
+                {"p { margin: 0; padding: 0; }"},
+                {"a > 12"},
+                {"a>12"},
+                {"a> 12"},
+                {"a >12"},
+                {"a<12"},
+                {"a < 12"},
+                {"a< 12"},
+                {"a <12"},
+                {"'a'"},
+                {"\"a\""},
+        });
+    }
+
+    private final String input;
+    private final ScadaValidator<String> validator;
+
+    public XssValidatorTest(String input) {
+        this.input = input;
+        this.validator = new XssValidator();
+    }
+
+    @Test
+    public void when_isInvalidXss() throws ScadaValidatorException {
+        validator.validate(input);
+    }
+}
diff --git a/test/org/scada_lts/web/beans/validation/xss/XssValidatorTestsSuite.java b/test/org/scada_lts/web/beans/validation/xss/XssValidatorTestsSuite.java
new file mode 100644
index 0000000000..70baf1b9e7
--- /dev/null
+++ b/test/org/scada_lts/web/beans/validation/xss/XssValidatorTestsSuite.java
@@ -0,0 +1,12 @@
+package org.scada_lts.web.beans.validation.xss;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        XssValidatorTest.class,
+        XssValidatorExceptionTest.class
+})
+public class XssValidatorTestsSuite {
+}
\ No newline at end of file
diff --git a/test/org/scada_lts/web/security/BodyXssValidatorUtilsTest.java b/test/org/scada_lts/web/security/BodyXssValidatorUtilsTest.java
new file mode 100644
index 0000000000..c4852dfd5d
--- /dev/null
+++ b/test/org/scada_lts/web/security/BodyXssValidatorUtilsTest.java
@@ -0,0 +1,160 @@
+package org.scada_lts.web.security;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class BodyXssValidatorUtilsTest {
+
+    private final String input;
+    private final boolean expectedResult;
+
+    public BodyXssValidatorUtilsTest(String input, boolean expectedResult) {
+        this.input = input;
+        this.expectedResult = expectedResult;
+    }
+
+    @Parameters(name = "{index}: input: {0}, expectedResult: {1}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+
+                // Test for a legitimate Query
+                {"validUser", true},
+                {"123", true},
+
+                // Tests for queries containing banned patterns.
+                {"javascript:alert(1)", false},
+                {"onerror=alert(1)", false},
+                {"<script>alert(1)</script>", false},
+                {"onload=alert(1)", false},
+                {"onmouseover=alert(1)", false},
+                {"%6A%61%76%61%73%63%72%69%70%74", true},
+
+                // Borderline cases
+                {"=&", true},
+                {"a”.repeat(33)", true},
+                {"invalid!key", true},
+                {"validKey", true},
+                {"onerror=alert(1)&onload=alert(1)", false},
+                {"!key=value", true},
+
+
+                {"abc", true},
+                {"ABC", true},
+                {"abc=abc", true},
+                {"ABC=ABC", true},
+                {"abc=abc&ABC=ABC", true},
+                {"ABC=ABC&abc=abc", true},
+                {"abc=1", true},
+                {"ABC=1", true},
+                {"param123", true},
+                {"param1&param2=23", true},
+                {"param1=12&param2", true},
+                {"param1=12&param2&param3", true},
+                {"param1", true},
+                {"startTs=123", true},
+                {"startTs=1724326168402&endTs=1724329768507", true},
+                {"startTs=123.", true},
+                {"startTs=12345678901234567890123456789012", true},
+                {"startTs=123456789012345678901234567890123", true},
+                {"12345678901234567890123456789012=abc", true},
+                {"123456789012345678901234567890123=abc", true},
+                {"startTs=1724326168402&endTs=1724329768507&ids=101,70,97,84&configFromSystem=false&enabled=false&valuesLimit=10000&limitFactor=1", true},
+                {"projectName=sagadf&includePointValues=true&includeUploadsFolder=true&includeGraphicsFolder=true&projectDescription=&pointValuesMaxZip=100", true},
+                {"projectName=sagadf&includePointValues=true&includeUploadsFolder=true&includeGraphicsFolder=true&projectDescription=&pointValuesMaxZip=1005", true},
+                {"projectName=sagadf&includePointValues=true&includeUploadsFolder=true&includeGraphicsFolder=true&projectDescription=&pointValuesMaxZip=100&abc=12", true},
+                {"abc=", true},
+
+                {"", true},
+                {null, true},
+                {"&param1", true},
+                {"&param1&param2", true},
+                {"&param1=123&param2", true},
+                {"&param1&param=123", true},
+                {"param1&param2=23&onerror", true},
+                {"param1&param2=23onerror", true},
+                {"param1&param2=23&onerror=", false},
+                {"param1&param2=23onerror=", false},
+                {"para!m1", true},
+                {"onerror=alert(1)", false},
+                {"onload=alert(1)", false},
+                {"onerror=abc", false},
+                {"onload=abc", false},
+                {"onload=", false},
+                {"onerror=", false},
+                {"onload =", false},
+                {"onerror =", false},
+                {"onload    =", false},
+                {"onerror   =", false},
+                {"onload", true},
+                {"onerror", true},
+                {"!param1=value", true},
+                {"<img src=x onerror=alert(document.location)>", false},
+                {"param1=<img src=x onerror=alert(document.location)>", false},
+                {"param1=<img src=x onerror=alert(document.location)>&param2=123", false},
+                {"param1=123&param2=<img src=x onerror=alert(document.location)>", false},
+                {"param1=123&param2=<img src=x onerror=document.location>", false},
+                {"param1=alert(document.location)", false},
+                {"=abc", true},
+                {"param1=<script>alert(document.location)", false},
+                {"param1=<scriptalert(document.location)", false},
+                {"param1=script>alert(document.location)", false},
+                {"param1=alert(document.location)</script>", false},
+                {"param1=alert(document.location)/script>", false},
+                {"param1=alert(document.location)</script", false},
+                {"param1=<script>document.location", false},
+                {"param1=<scriptdocument.location", false},
+                {"param1=script>document.location", false},
+                {"param1=document.location</script>", false},
+                {"param1=document.location/script>", false},
+                {"param1=document.location</script", false},
+                {"#top-description-container {\n" +
+                        "    display: flex;\n" +
+                        "    align-items: flex-end;\n" +
+                        "    justify-content: center;\n" +
+                        "} \n" +
+                        "\n" +
+                        "#top-description-prefix { \n" +
+                        "    color: red !important;\n" +
+                        "    font-size: 2em !important;\n" +
+                        "    margin-left: 0.5em !important;\n" +
+                        "    margin-right: 0.5em !important;\n" +
+                        "    display: inline-block !important;\n" +
+                        "    vertical-align: bottom !important;\n" +
+                        "    line-height: 1 !important;\n" +
+                        "} \n" +
+                        "\n" +
+                        "#top-description {\n" +
+                        "    color: #39B54A !important;\n" +
+                        "    font-size: 2em !important;\n" +
+                        "    display: inline-block !important;\n" +
+                        "    line-height: 1 !important; \n" +
+                        "}", true},
+                {"#top-description-container {\n" +
+                        "    display: flex;\n" +
+                        "    align-items: flex-end;\n" +
+                        "    justify-content: center;\n" +
+                        "}", true},
+                {"#top-description-container {\n" +
+                        "    display: flex;\n" +
+                        "}", true}
+        });
+    }
+
+    @Test
+    public void testValidate() {
+
+        //when:
+        boolean result = XssValidatorUtils.validateHttpBody(input);
+
+        //then:
+        assertEquals("Validation Body failed for input: " + input, expectedResult, result);
+    }
+}
diff --git a/test/org/scada_lts/web/security/XssProtectUtilsTest.java b/test/org/scada_lts/web/security/XssProtectUtilsTest.java
new file mode 100644
index 0000000000..217aecc30e
--- /dev/null
+++ b/test/org/scada_lts/web/security/XssProtectUtilsTest.java
@@ -0,0 +1,62 @@
+package org.scada_lts.web.security;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@RunWith(Parameterized.class)
+public class XssProtectUtilsTest {
+
+    @Parameterized.Parameters(name = "{index}: content: {0}, expected: {1}")
+    public static List<Object[]> data() {
+        List<Object[]> datas = new ArrayList<>();
+
+        datas.add(new Object[] {"\\n - \n", "\\n - &#10;"});
+        datas.add(new Object[] {"\\r - \r", "\\r - &#13;"});
+
+        datas.add(new Object[] {"\\t - \t", "\\t - &emsp;"});
+        datas.add(new Object[] {"\\u000B - \u000B", "\\u000B - &#11;"});
+        datas.add(new Object[] {"\\f - \f", "\\f - &#12;"});
+        datas.add(new Object[] {"\\u001C - \u001C", "\\u001C - &#28;"});
+        datas.add(new Object[] {"\\u001D - \u001D", "\\u001D - &#29;"});
+        datas.add(new Object[] {"\\u001E - \u001E", "\\u001E - &#30;"});
+        datas.add(new Object[] {"\\u001F - \u001F", "\\u001F - &#31;"});
+
+        datas.add(new Object[] {"<script>alert('abc!')</script>", "&lt;script&gt;alert(&#39;abc!&#39;)&lt;/script&gt;"});
+        datas.add(new Object[] {"body {\n" +
+                "\tfont-size: 62.5%;\n" +
+                "}\n" +
+                "\n" +
+                "table {\n" +
+                "\tfont-size: 1em;\n" +
+                "}", "body {&#10;&emsp;font-size: 62.5%;&#10;}&#10;&#10;table {&#10;&emsp;font-size: 1em;&#10;}"});
+        datas.add(new Object[] {"<img src=x onerror=document.location>", "&lt;img src=x onerror=document.location&gt;"});
+        datas.add(new Object[] {"<img src=x onerror=alert(document.location)>", "&lt;img src=x onerror=alert(document.location)&gt;"});
+        datas.add(new Object[] {"alert(document.location)", "alert(document.location)"});
+
+        return datas;
+    }
+
+    private final String content;
+    private final String expected;
+
+    public XssProtectUtilsTest(String content, String expected) {
+        this.content = content;
+        this.expected = expected;
+    }
+
+    @Test
+    public void escapeHtml() {
+
+        //when
+        String result = XssProtectUtils.escapeHtml(content);
+
+        //then:
+        Assert.assertEquals(expected, result);
+    }
+}
\ No newline at end of file
diff --git a/test/org/scada_lts/web/security/XssValidatorUtilsTest.java b/test/org/scada_lts/web/security/XssValidatorUtilsTest.java
new file mode 100644
index 0000000000..93b2eb2703
--- /dev/null
+++ b/test/org/scada_lts/web/security/XssValidatorUtilsTest.java
@@ -0,0 +1,160 @@
+package org.scada_lts.web.security;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+@RunWith(Parameterized.class)
+public class XssValidatorUtilsTest {
+
+    private final String input;
+    private final boolean expectedResult;
+
+    public XssValidatorUtilsTest(String input, boolean expectedResult) {
+        this.input = input;
+        this.expectedResult = expectedResult;
+    }
+
+    @Parameters(name = "{index}: input: {0}, expectedResult: {1}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+
+                // Test for a legitimate Query
+                {"validUser", true},
+                {"123", true},
+
+                // Tests for queries containing banned patterns.
+                {"javascript:alert(1)", false},
+                {"onerror=alert(1)", false},
+                {"<script>alert(1)</script>", false},
+                {"onload=alert(1)", false},
+                {"onmouseover=alert(1)", false},
+                {"%6A%61%76%61%73%63%72%69%70%74", false},
+
+                // Borderline cases
+                {"=&", false},
+                {"a”.repeat(33)", false},
+                {"invalid!key", false},
+                {"validKey", true},
+                {"onerror=alert(1)&onload=alert(1)", false},
+                {"!key=value", false},
+
+
+                {"abc", true},
+                {"ABC", true},
+                {"abc=abc", true},
+                {"ABC=ABC", true},
+                {"abc=abc&ABC=ABC", true},
+                {"ABC=ABC&abc=abc", true},
+                {"abc=1", true},
+                {"ABC=1", true},
+                {"param123", true},
+                {"param1&param2=23", true},
+                {"param1=12&param2", true},
+                {"param1=12&param2&param3", true},
+                {"param1", true},
+                {"startTs=123", true},
+                {"startTs=1724326168402&endTs=1724329768507", true},
+                {"startTs=123.", true},
+                {"startTs=12345678901234567890123456789012", true},
+                {"startTs=123456789012345678901234567890123", true},
+                {"12345678901234567890123456789012=abc", true},
+                {"123456789012345678901234567890123=abc", true},
+                {"startTs=1724326168402&endTs=1724329768507&ids=101,70,97,84&configFromSystem=false&enabled=false&valuesLimit=10000&limitFactor=1", true},
+                {"projectName=sagadf&includePointValues=true&includeUploadsFolder=true&includeGraphicsFolder=true&projectDescription=&pointValuesMaxZip=100", true},
+                {"projectName=sagadf&includePointValues=true&includeUploadsFolder=true&includeGraphicsFolder=true&projectDescription=&pointValuesMaxZip=1005", false},
+                {"projectName=sagadf&includePointValues=true&includeUploadsFolder=true&includeGraphicsFolder=true&projectDescription=&pointValuesMaxZip=100&abc=12", false},
+                {"abc=", true},
+
+                {"", true},
+                {null, true},
+                {"&param1", false},
+                {"&param1&param2", false},
+                {"&param1=123&param2", false},
+                {"&param1&param=123", false},
+                {"param1&param2=23&onerror", false},
+                {"param1&param2=23onerror", false},
+                {"param1&param2=23&onerror=", false},
+                {"param1&param2=23onerror=", false},
+                {"para!m1", false},
+                {"onerror=alert(1)", false},
+                {"onload=alert(1)", false},
+                {"onerror=abc", false},
+                {"onload=abc", false},
+                {"onload=", false},
+                {"onerror=", false},
+                {"onload =", false},
+                {"onerror =", false},
+                {"onload    =", false},
+                {"onerror   =", false},
+                {"onload", false},
+                {"onerror", false},
+                {"!param1=value", false},
+                {"<img src=x onerror=alert(document.location)>", false},
+                {"param1=<img src=x onerror=alert(document.location)>", false},
+                {"param1=<img src=x onerror=alert(document.location)>&param2=123", false},
+                {"param1=123&param2=<img src=x onerror=alert(document.location)>", false},
+                {"param1=123&param2=<img src=x onerror=document.location>", false},
+                {"param1=alert(document.location)", false},
+                {"=abc", false},
+                {"param1=<script>alert(document.location)", false},
+                {"param1=<scriptalert(document.location)", false},
+                {"param1=script>alert(document.location)", false},
+                {"param1=alert(document.location)</script>", false},
+                {"param1=alert(document.location)/script>", false},
+                {"param1=alert(document.location)</script", false},
+                {"param1=<script>document.location", false},
+                {"param1=<scriptdocument.location", false},
+                {"param1=script>document.location", false},
+                {"param1=document.location</script>", false},
+                {"param1=document.location/script>", false},
+                {"param1=document.location</script", false},
+                {"#top-description-container {\n" +
+                "    display: flex;\n" +
+                "    align-items: flex-end;\n" +
+                "    justify-content: center;\n" +
+                "} \n" +
+                "\n" +
+                "#top-description-prefix { \n" +
+                "    color: red !important;\n" +
+                "    font-size: 2em !important;\n" +
+                "    margin-left: 0.5em !important;\n" +
+                "    margin-right: 0.5em !important;\n" +
+                "    display: inline-block !important;\n" +
+                "    vertical-align: bottom !important;\n" +
+                "    line-height: 1 !important;\n" +
+                "} \n" +
+                "\n" +
+                "#top-description {\n" +
+                "    color: #39B54A !important;\n" +
+                "    font-size: 2em !important;\n" +
+                "    display: inline-block !important;\n" +
+                "    line-height: 1 !important; \n" +
+                "}", false},
+                {"#top-description-container {\n" +
+                        "    display: flex;\n" +
+                        "    align-items: flex-end;\n" +
+                        "    justify-content: center;\n" +
+                        "}", false},
+                {"#top-description-container {\n" +
+                        "    display: flex;\n" +
+                        "}", false}
+        });
+    }
+
+    @Test
+    public void testValidate() {
+
+        //when:
+        boolean result = XssValidatorUtils.validateHttpQuery(input);
+
+        //then:
+        assertEquals("Validation failed for input: " + input, expectedResult, result);
+    }
+}
diff --git a/test/org/scada_lts/web/security/XssValidatorUtilsTestsSuite.java b/test/org/scada_lts/web/security/XssValidatorUtilsTestsSuite.java
new file mode 100644
index 0000000000..126ae625c6
--- /dev/null
+++ b/test/org/scada_lts/web/security/XssValidatorUtilsTestsSuite.java
@@ -0,0 +1,12 @@
+package org.scada_lts.web.security;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        XssValidatorUtilsTest.class,
+        BodyXssValidatorUtilsTest.class
+})
+public class XssValidatorUtilsTestsSuite {
+}
\ No newline at end of file
diff --git a/test/utils/ScriptTestUtils.java b/test/utils/ScriptTestUtils.java
index b0a050abcf..e9a51fd4ac 100644
--- a/test/utils/ScriptTestUtils.java
+++ b/test/utils/ScriptTestUtils.java
@@ -7,12 +7,14 @@
 import com.serotonin.mango.rt.dataImage.DataPointRT;
 import com.serotonin.mango.rt.dataImage.PointValueTime;
 import com.serotonin.mango.rt.dataImage.types.MangoValue;
+import com.serotonin.mango.rt.dataSource.DataSourceRT;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.DataPointVO.LoggingTypes;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.dataSource.PointLocatorVO;
 import com.serotonin.mango.vo.dataSource.virtual.VirtualPointLocatorVO;
 import com.serotonin.mango.vo.permission.Permissions;
+import org.mockito.Mockito;
 import org.scada_lts.web.beans.ApplicationBeans;
 import org.scada_lts.web.ws.services.DataPointServiceWebSocket;
 import utils.mock.MockUtils;
@@ -72,4 +74,10 @@ public static void configMock(RuntimeManager runtimeManager, ScriptContextObject
         when(ApplicationBeans.getDataPointServiceWebSocketBean()).thenReturn(dataPointServiceWebSocket);
     }
 
+    public static void configScriptMock(RuntimeManager runtimeManager, ScriptContextObject scriptContextObject) throws Exception {
+        DataSourceRT dataSourceRT = mock(DataSourceRT.class);
+        Mockito.when(dataSourceRT.isInitialized()).thenReturn(true);
+        Mockito.when(runtimeManager.getRunningDataSource(anyInt())).thenReturn(dataSourceRT);
+        ScriptTestUtils.configMock(runtimeManager, scriptContextObject);
+    }
 }
diff --git a/test/br/org/scadabr/db/utils/TestUtils.java b/test/utils/TestUtils.java
similarity index 76%
rename from test/br/org/scadabr/db/utils/TestUtils.java
rename to test/utils/TestUtils.java
index 7da49f533a..2f1de5a9b4 100644
--- a/test/br/org/scadabr/db/utils/TestUtils.java
+++ b/test/utils/TestUtils.java
@@ -1,11 +1,15 @@
-package br.org.scadabr.db.utils;
+package utils;
 
 import java.util.ArrayList;
+import java.util.List;
 
+import com.serotonin.db.IntValuePair;
 import com.serotonin.mango.db.dao.UserDao;
 import com.serotonin.mango.vo.DataPointVO;
 import com.serotonin.mango.vo.User;
 import com.serotonin.mango.vo.dataSource.DataSourceVO;
+import com.serotonin.mango.vo.dataSource.PointLocatorVO;
+import com.serotonin.mango.vo.dataSource.meta.MetaPointLocatorVO;
 import com.serotonin.mango.vo.dataSource.virtual.VirtualDataSourceVO;
 import com.serotonin.mango.vo.dataSource.virtual.VirtualPointLocatorVO;
 import com.serotonin.mango.vo.permission.DataPointAccess;
@@ -59,8 +63,8 @@ public static User createUser() {
 		user.setHomeUrl("url");
 		user.setReceiveAlarmEmails(1);
 		user.setReceiveOwnAuditEvents(true);
-		user.setDataSourcePermissions(new ArrayList<Integer>());
-		user.setDataPointPermissions(new ArrayList<DataPointAccess>());
+		user.setDataSourcePermissions(new ArrayList<>());
+		user.setDataPointPermissions(new ArrayList<>());
 
 		new UserDao().saveUser(user);
 		return user;
@@ -78,8 +82,8 @@ public static User newUser(int id) {
 		user.setHomeUrl("url");
 		user.setReceiveAlarmEmails(1);
 		user.setReceiveOwnAuditEvents(true);
-		user.setDataSourcePermissions(new ArrayList<Integer>());
-		user.setDataPointPermissions(new ArrayList<DataPointAccess>());
+		user.setDataSourcePermissions(new ArrayList<>());
+		user.setDataPointPermissions(new ArrayList<>());
 		return user;
 	}
 
@@ -96,6 +100,7 @@ public static DataPointVO newPointSettable(int id, int folderId) {
 		VirtualPointLocatorVO pointLocatorVO = new VirtualPointLocatorVO();
 		pointLocatorVO.setSettable(true);
 		dataPoint1.setPointLocator(pointLocatorVO);
+		dataPoint1.setEventDetectors(new ArrayList<>());
 		return dataPoint1;
 	}
 
@@ -112,6 +117,23 @@ public static DataPointVO newPointSettable(int id, DataSourceVO<?> dataSource, i
 		VirtualPointLocatorVO pointLocatorVO = new VirtualPointLocatorVO();
 		pointLocatorVO.setSettable(true);
 		dataPoint1.setPointLocator(pointLocatorVO);
+		dataPoint1.setEventDetectors(new ArrayList<>());
+		return dataPoint1;
+	}
+
+	public static DataPointVO newPointSettable(int id, DataSourceVO<?> dataSource,
+											   int folderId, PointLocatorVO metaPointLocatorVO) {
+		DataPointVO dataPoint1 = new DataPointVO(DataPointVO.LoggingTypes.ON_CHANGE);
+		dataPoint1.setId(id);
+		dataPoint1.setXid("DP_" + id);
+		dataPoint1.setName("dp_" + id);
+		dataPoint1.setDataSourceId(dataSource.getId());
+		dataPoint1.setDataSourceName(dataSource.getName());
+		dataPoint1.setDataSourceTypeId(dataSource.getType().getId());
+		dataPoint1.setDataSourceXid(dataSource.getXid());
+		dataPoint1.setPointFolderId(folderId);
+		dataPoint1.setPointLocator(metaPointLocatorVO);
+		dataPoint1.setEventDetectors(new ArrayList<>());
 		return dataPoint1;
 	}
 
@@ -128,6 +150,7 @@ public static DataPointVO newPointNonSettable(int id, DataSourceVO<?> dataSource
 		VirtualPointLocatorVO pointLocatorVO = new VirtualPointLocatorVO();
 		pointLocatorVO.setSettable(false);
 		dataPoint1.setPointLocator(pointLocatorVO);
+		dataPoint1.setEventDetectors(new ArrayList<>());
 		return dataPoint1;
 	}
 
@@ -155,4 +178,22 @@ public static User newUser(int id, String username) {
 		user.setDataPointPermissions(new ArrayList<DataPointAccess>());
 		return user;
 	}
+
+	public static DataPointVO newMetaPointSettable(int id, int folderId, List<IntValuePair> context) {
+		DataPointVO dataPoint1 = new DataPointVO(DataPointVO.LoggingTypes.ON_CHANGE);
+		dataPoint1.setId(id);
+		dataPoint1.setXid("DP_" + id);
+		dataPoint1.setName("dp_" + id);
+		dataPoint1.setDataSourceId(99999);
+		dataPoint1.setDataSourceName("ds_name");
+		dataPoint1.setDataSourceTypeId(9);
+		dataPoint1.setDataSourceXid("DS_XID");
+		dataPoint1.setPointFolderId(folderId);
+		MetaPointLocatorVO pointLocatorVO = new MetaPointLocatorVO();
+		pointLocatorVO.setContext(context);
+		pointLocatorVO.setSettable(true);
+		dataPoint1.setPointLocator(pointLocatorVO);
+		dataPoint1.setEventDetectors(new ArrayList<>());
+		return dataPoint1;
+	}
 }
diff --git a/test/utils/mock/EventServiceMock.java b/test/utils/mock/EventServiceMock.java
index 2b28d870ef..f546cf6e48 100644
--- a/test/utils/mock/EventServiceMock.java
+++ b/test/utils/mock/EventServiceMock.java
@@ -32,12 +32,12 @@ public void saveEvent(EventInstance event) {
     }
 
     @Override
-    public void ackEvent(int eventId, long time, int userId, int alternateAckSource, boolean signalAlarmLevelChange) {
+    public void ackEvent(EventInstance eventId, long time, User userId, int alternateAckSource, boolean signalAlarmLevelChange) {
 
     }
 
     @Override
-    public void ackEvent(int eventId, long time, int userId, int alternateAckSource) {
+    public void ackEvent(EventInstance eventId, long time, User userId, int alternateAckSource) {
 
     }
 
@@ -224,8 +224,8 @@ public void deleteEventHandler(String handlerXid) {
     }
 
     @Override
-    public boolean toggleSilence(int eventId, int userId) {
-        return super.toggleSilence(eventId, userId);
+    public boolean toggleSilence(EventInstance event, User user) {
+        return false;
     }
 
     @Override
@@ -300,4 +300,14 @@ public void setAdded(boolean added) {
     public void addEvent(EventInstance eventInstance) {
         this.events.add(eventInstance);
     }
+
+    @Override
+    public void ackEvent(int eventId, long time, int userId, int alternateAckSource, boolean signalAlarmLevelChange) {
+
+    }
+
+    @Override
+    public void ackEvent(int eventId, long time, int userId, int alternateAckSource) {
+
+    }
 }
diff --git a/test/utils/mock/MockUtils.java b/test/utils/mock/MockUtils.java
index 30b5dd8bb5..57e02d50ba 100644
--- a/test/utils/mock/MockUtils.java
+++ b/test/utils/mock/MockUtils.java
@@ -53,7 +53,7 @@ public static void configMock(RuntimeManager runtimeManager, User user) throws E
         when(Common.getUser()).thenReturn(user);
         when(Common.getUser(any(HttpServletRequest.class))).thenReturn(user);
 
-        PropertiesUtils propertiesUtils = new PropertiesUtils("WEB-INF/classes/env");
+        PropertiesUtils propertiesUtils = new PropertiesUtils("env");
         when(Common.getEnvironmentProfile()).thenReturn(propertiesUtils);
     }
 
diff --git a/test/utils/mock/RuntimeMockUtils.java b/test/utils/mock/RuntimeMockUtils.java
new file mode 100644
index 0000000000..6fd56c22d4
--- /dev/null
+++ b/test/utils/mock/RuntimeMockUtils.java
@@ -0,0 +1,66 @@
+package utils.mock;
+
+import com.serotonin.mango.Common;
+import com.serotonin.mango.rt.EventManager;
+import com.serotonin.mango.rt.RuntimeManager;
+import com.serotonin.mango.rt.maint.BackgroundProcessing;
+import com.serotonin.mango.util.timeout.TimeoutTask;
+import com.serotonin.mango.web.ContextWrapper;
+import org.powermock.api.mockito.PowerMockito;
+import org.scada_lts.dao.SystemSettingsDAO;
+import org.scada_lts.mango.service.DataPointService;
+import org.scada_lts.mango.service.DataSourceService;
+import org.scada_lts.mango.service.PointValueService;
+import org.scada_lts.mango.service.SystemSettingsService;
+import org.scada_lts.web.beans.ApplicationBeans;
+import org.scada_lts.web.ws.services.DataPointServiceWebSocket;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.powermock.api.mockito.PowerMockito.*;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+public final class RuntimeMockUtils {
+
+    private RuntimeMockUtils() {}
+
+    public static void runtimeManagerMock(RuntimeManager runtimeManager, EventManager eventManager) throws Exception {
+
+        DataSourceService dataSourceService = PowerMockito.mock(DataSourceService.class);
+        whenNew(DataSourceService.class).withNoArguments().thenReturn(dataSourceService);
+
+        DataPointService dataPointService = PowerMockito.mock(DataPointService.class);
+        whenNew(DataPointService.class).withNoArguments().thenReturn(dataPointService);
+
+        SystemSettingsService systemSettingsService = PowerMockito.mock(SystemSettingsService.class);
+        whenNew(SystemSettingsService.class).withNoArguments().thenReturn(systemSettingsService);
+
+        SystemSettingsDAO systemSettingsDAO = PowerMockito.mock(SystemSettingsDAO.class);
+        whenNew(SystemSettingsDAO.class).withNoArguments().thenReturn(systemSettingsDAO);
+
+        mockStatic(SystemSettingsDAO.class);
+        when(SystemSettingsDAO.getValue(anyString())).thenReturn("");
+        when(SystemSettingsDAO.getFutureDateLimit()).thenReturn(1L);
+
+        PointValueService mangoPointValues = PowerMockito.mock(PointValueService.class);
+        whenNew(PointValueService.class).withNoArguments().thenReturn(mangoPointValues);
+
+        mockStatic(ApplicationBeans.class);
+        DataPointServiceWebSocket dataPointServiceWebSocket = PowerMockito.mock(DataPointServiceWebSocket.class);
+        when(ApplicationBeans.getDataPointServiceWebSocketBean()).thenReturn(dataPointServiceWebSocket);
+
+        ContextWrapper contextWrapper = PowerMockito.mock(ContextWrapper.class);
+        BackgroundProcessing backgroundProcessing = PowerMockito.mock(BackgroundProcessing.class);
+
+        when(contextWrapper.getRuntimeManager()).thenReturn(runtimeManager);
+        when(contextWrapper.getEventManager()).thenReturn(eventManager);
+        when(contextWrapper.getBackgroundProcessing()).thenReturn(backgroundProcessing);
+
+        TimeoutTask timeoutTaskMock = mock(TimeoutTask.class);
+        whenNew(TimeoutTask.class).withAnyArguments()
+                .thenReturn(timeoutTaskMock);
+
+        Common.ctx = contextWrapper;
+        Common.timer.init();
+
+    }
+}
diff --git a/webapp-resources/env.properties b/webapp-resources/env.properties
index 02301d935f..8de241ad46 100644
--- a/webapp-resources/env.properties
+++ b/webapp-resources/env.properties
@@ -185,3 +185,19 @@ http.protocol.method.follow-redirects=false
 http.protocol.max-redirects=100
 http.protocol.allow-circular-redirects=false
 http.protocol.timeout-ms=15000
+event.assign.enabled=true
+
+scadalts.security.http.query.protect.enabled=true
+scadalts.security.http.query.limit=3900
+scadalts.security.http.query.access.denied.regex=^(.*?(script>|<script|/script>|</script|javascript:|onerror|onload|onmouseover|alert\\(){1}.*?)$
+scadalts.security.http.query.access.granted.regex=^(([a-zA-Z0-9_\\-]{1,32}=[a-zA-Z0-9_\\-.,/+=\s!$*?@%]*&?)|([a-zA-Z0-9_\\-]{1,32}&?))+$
+
+systemsettings.custom.css.content=#top-description-container {\n\r\t\t\t\tdisplay: flex;\n\r\t\t\t\talign-items: flex-end;\n\r\t\t\t\tjustify-content: center;\n\r} \n\r\n\r#top-description-prefix { \n\r\t\t\t\tcolor: black !important;\n\r\t\t\t\tfont-size: 2em !important;\n\r\t\t\t\tmargin-left: 0.5em !important;\n\r\t\t\t\tmargin-right: 0.5em !important;\n\r\t\t\t\tdisplay: inline-block !important;\n\r\t\t\t\tvertical-align: bottom !important;\n\r\t\t\t\tline-height: 1 !important;\n\r} \n\r\n\r#top-description {\n\r\t\t\t\tcolor: #39B54A !important;\n\r\t\t\t\tfont-size: 2em !important;\n\r\t\t\t\tdisplay: inline-block !important;\n\r\t\t\t\tline-height: 1 !important;\n\r}
+
+scadalts.security.http.body.protect.enabled=true
+scadalts.security.http.body.access.denied.regex=^(.*?((expression\\s*\\()|url\\s*\\(\\s*['\"]?javascript:|url\\s*\\(\\s*['\"]?data:|<script[^>]*>|</script>|<img[^>]+onerror=|@import\\s+url\\s*\\(\\s*['\"]?javascript:|<img[^>]*>|<script[^>]*>|<[^>]+>onerror\\s*=|onload\\s*=|eval\\s*\\(|alert\\s*\\(|onerror\\s*=|document.location){1}.*?)$
+scadalts.security.http.body.access.granted.regex=^([\\s\\S]*)$
+
+systemsettings.reports.data-point-extended-name-length.limit=64
+#save-value-as-escaped configuration for Scada-LTS version <= v2.7.8 is true
+data-type.alphanumeric.save-value-as-escaped=false
\ No newline at end of file
diff --git a/webapp-resources/log4j2.xml b/webapp-resources/log4j2.xml
index 3def578e1d..996e610ff7 100644
--- a/webapp-resources/log4j2.xml
+++ b/webapp-resources/log4j2.xml
@@ -36,11 +36,18 @@
         <Property name="eventManagerLoggingLevel">ERROR</Property>
         <Property name="modbusLoggingLevel">ERROR</Property>
         <Property name="dataPointRtLoggingLevel">INFO</Property>
-        <Property name="dataSourceRtLoggingLevel">INFO</Property>
+        <Property name="dataSourceRtLoggingLevel">ERROR</Property>
         <Property name="detectorRtLoggingLevel">INFO</Property>
 
         <!-- Parse log4j2.xml Logging-->
         <Property name="log4jLoggingLevel">ERROR</Property>
+
+        <!-- Security Logging-->
+        <Property name="securityLoggingLevel">ERROR</Property>
+
+        <!-- Java Bean Validation Logging-->
+        <Property name="validationLoggingLevel">ERROR</Property>
+
     </Properties>
 
     <Appenders>
@@ -155,6 +162,8 @@
             <AppenderRef ref="ASYNC_FLYWAY"/>
         </Logger>
 
+        <Logger name="org.scada_lts.login" level="${startupLoggingLevel}"/>
+
         <!-- BackgroundProcessing Logging-->
         <Logger name="com.serotonin.mango.rt.maint.BackgroundProcessing" level="${backgroundProcessingLoggingLevel}"/>
 
@@ -169,6 +178,7 @@
         <Logger name="log_jsp" level="${dwrLoggingLevel}"/>
         <Logger name="org.directwebremoting" level="${dwrLoggingLevel}"/>
         <Logger name="com.serotonin.mango.web.dwr.DataPointEditDwr" level="${dwrLoggingLevel}"/>
+        <Logger name="com.serotonin.mango.web.dwr" level="${dwrLoggingLevel}"/>
 
         <!-- Spring Logging-->
         <Logger name="org.springframework.web.servlet.FrameworkServlet" level="${springLoggingLevel}"/>
@@ -249,6 +259,13 @@
             <AppenderRef ref="ASYNC_SCRIPT"/>
         </Logger>
 
+        <Logger name="com.serotonin.mango.rt.dataSource.meta.ScriptExecutor" level="${scriptLoggingLevel}" >
+            <AppenderRef ref="ASYNC_SCRIPT"/>
+        </Logger>
+        <Logger name="br.org.scadabr.rt.scripting.ContextualizedScriptRT" level="${scriptLoggingLevel}" >
+            <AppenderRef ref="ASYNC_SCRIPT"/>
+        </Logger>
+
         <!-- DataPointRT -->
         <Logger name="com.serotonin.mango.rt.dataImage.DataPointRT" level="${dataPointRtLoggingLevel}" >
             <AppenderRef ref="ASYNC_SCRIPT"/>
@@ -281,11 +298,42 @@
             <AppenderRef ref="ASYNC_MODBUS"/>
         </Logger>
 
+        <!-- Data Source RT -->
+        <Logger name="com.serotonin.mango.rt.dataSource" level="${dataSourceRtLoggingLevel}" >
+            <AppenderRef ref="ASYNC_SCRIPT"/>
+        </Logger>
+
+        <Logger name="org.scada_lts.ds" level="${dataSourceRtLoggingLevel}" >
+            <AppenderRef ref="ASYNC_SCRIPT"/>
+        </Logger>
+
+        <Logger name="br.org.scadabr.rt.dataSource" level="${dataSourceRtLoggingLevel}" >
+            <AppenderRef ref="ASYNC_SCRIPT"/>
+        </Logger>
+
+        <Logger name="cc.radiuino.scadabr.rt.datasource" level="${dataSourceRtLoggingLevel}" >
+            <AppenderRef ref="ASYNC_SCRIPT"/>
+        </Logger>
+
+        <!-- Data Point RT -->
+
+        <Logger name="com.serotonin.mango.rt.dataImage" level="${dataPointRtLoggingLevel}" >
+            <AppenderRef ref="ASYNC_SCRIPT"/>
+        </Logger>
+
         <!-- Parse log4j2.xml Logging-->
         <Logger name="org.apache.log4j.xml" level="${log4jLoggingLevel}">
             <AppenderRef ref="ASYNC"/>
         </Logger>
 
+        <!-- Security Logging-->
+        <Logger name="org.scada_lts.web.security" level="${securityLoggingLevel}" />
+        <Logger name="org.springframework.security" level="${securityLoggingLevel}" />
+
+        <!-- Java Bean Validation Logging -->
+        <Logger name="javax.validation" level="${validationLoggingLevel}" />
+        <Logger name="org.scada_lts.web.beans.validation" level="${validationLoggingLevel}" />
+
         <Root level="${rootLoggingLevel}">
             <AppenderRef ref="STDOUT"/>
             <AppenderRef ref="ASYNC"/>
diff --git a/webapp-resources/messages_de.properties b/webapp-resources/messages_de.properties
index 69655cf330..6c7d2ab7ab 100644
--- a/webapp-resources/messages_de.properties
+++ b/webapp-resources/messages_de.properties
@@ -756,7 +756,7 @@ dsEdit.mbus.vifeLabel=Vifes
 dsEdit.mbus.vifeLabels=Vife Label
 dsEdit.mbus.vifeTypes=Vife Typen
 dsEdit.meta=Meta Datenquelle
-dsEdit.meta.delay=Berechnungsverz\u00f6gerung</br>
+dsEdit.meta.delay=Berechnungsverz\u00f6gerung
 dsEdit.meta.desc=Meta Datenquelle Konfiguration
 dsEdit.meta.event=Aktualisierungsereignis
 dsEdit.meta.event.context=\u00c4nderung der Eingangsvariablen
@@ -1160,8 +1160,8 @@ dsEdit.validate.required=Required value
 dsEdit.viconics=Viconics Wireless Thermostats
 dsEdit.viconics.channel=Channel
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.chipRevisionBr=Chip revision
+dsEdit.viconics.commAddress=Comm address
 dsEdit.viconics.convertCelsius=Convert temperatures to celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Data source is not started
@@ -1170,9 +1170,9 @@ dsEdit.viconics.deviceRemove=Device remove (s)
 dsEdit.viconics.deviceWarning=Device offline timeone (s)
 dsEdit.viconics.devices=Devices
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Channel: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.viconics.networkIdentifyFailure=Network identify failed: {0}
 dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.networkTimeout=Network offline timeout (s)
@@ -1186,9 +1186,9 @@ dsEdit.viconics.timeout=Message timeout
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Virtuelle Datenquelle
 dsEdit.virtual.attractionPoint=Datenpunkt Attraktor
 dsEdit.virtual.change=\u00c4nderung
@@ -1334,7 +1334,7 @@ emport.importProjectTitle=Import Project (Upload)
 emport.includePointValues=Include point values
 emport.indent=Einr\u00fcckung
 emport.invalidFile=File reading failed ({0})
-emport.invalidImportData=Zu importierende Daten sind ung\u00fctig: kein <a href="www.json.org">JSON</a> object.
+emport.invalidImportData=Zu importierende Daten sind ung\u00fctig: kein JSON object. (www.json.org)
 emport.invalidProjectName=Invalid name
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
 emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
@@ -1567,8 +1567,8 @@ engUnit.98=percent
 engUnit.99=percent per second
 engUnit.190=kilometers
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavolt amperes
 engUnit.abbr.100=per minute
 engUnit.abbr.101=per second
@@ -1789,7 +1789,7 @@ event.alarmMaxDecreased=H\u00f6chste Alarmpriorit\u00e4t verringerte sich von {0
 event.alarmMaxIncreased=H\u00f6chste Alarmpriorit\u00e4t erh\u00f6te sich von {0} auf {1}
 event.audit.added=Benutzer "{0}" erzeugte {1} mit id {2}: {3}
 event.audit.changed=Benutzer "{0}" \u00e4nderte {1} mit id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" zu "{2}"
+event.audit.changedProperty={0}: "{1}" zu "{2}"
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Datenpunkt
 event.audit.dataSource=Datenquelle
@@ -1798,7 +1798,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2103,8 +2103,8 @@ eventHandlers.invalidInactiveSourceType=Invalid inactive source point data type
 eventHandlers.invalidInactiveValue=Invalid inactive value to set
 eventHandlers.invalidScripts=Selecione ao menos um script
 eventHandlers.maintenanceEvents=Maintenance events
-eventHandlers.noEmailRecips=Keine Email Empf\u00e4nger!<br>Sie m\u00fcssen mindestens einen Email Empf\u00e4nger hinzuf\u00fcgen
-eventHandlers.noEscalRecips=Kein Eskalations Email Empf\u00e4nger!<br>Sie m\u00fcssen mindestens einen Eskalations Email Empf\u00e4nger hinzuf\u00fcgen
+eventHandlers.noEmailRecips=Keine Email Empf\u00e4nger! Sie m\u00fcssen mindestens einen Email Empf\u00e4nger hinzuf\u00fcgen
+eventHandlers.noEscalRecips=Kein Eskalations Email Empf\u00e4nger! Sie m\u00fcssen mindestens einen Eskalations Email Empf\u00e4nger hinzuf\u00fcgen
 eventHandlers.noInactiveRecips=You must add inactive recipients
 eventHandlers.noSetPointAction=No set point action has been defined
 eventHandlers.noTargetPoint=No target point selected. You may not have any settable points defined.
@@ -2294,7 +2294,7 @@ login.nag=Hinweis: Sie k\u00f6nnten Probleme mit ScadaLTS haben, da dierser Brow
 login.password=Kennwort
 login.supportedBrowser=Dieser Browser wird unterst\u00fctzt
 login.unknownBrowser=Unbekannter Browser
-login.unsupportedBrowser=Dieser Browser wird offiziell nicht von Serotonin Software unterst\u00fctzt. Wir empfehlen <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, oder  Internet Explorer 7.
+login.unsupportedBrowser=Dieser Browser wird offiziell nicht von Serotonin Software unterst\u00fctzt. Wir empfehlen Mozilla Firefox, Google Chrome.
 login.userId=Benutzername
 login.validation.accountDisabled=Ihr Account wurde gesperrt, bitte wenden Sie sich an Ihren Administrator
 login.validation.invalidLogin=Login gescheitert, bitte versuchen Sie es noch einmal
@@ -2412,7 +2412,7 @@ pointDetails.username=Benutzername
 pointDetails.views=Ansichten
 pointEdit.buttons.disable=Ausschalten
 pointEdit.buttons.enable=Einschalten
-pointEdit.buttons.note=<span class="smallTitle">Hinweis:</span> speichern, deaktivieren oder neu starten setzen alle aktiven Ereignisse zur\u00fcck.
+pointEdit.buttons.note=speichern, deaktivieren oder neu starten setzen alle aktiven Ereignisse zur\u00fcck.
 pointEdit.buttons.restart=Neustart
 pointEdit.chart.includeSum=Summe berechnen
 pointEdit.chart.invalidLimit=Tabelle: Anzahl muss zwischen 2 und 50 liegen
@@ -2801,7 +2801,7 @@ sql.query=SQL-Abfrage starten
 sql.rowsUpdated=Datens\u00e4tze aktualisiert
 sql.sql=SQL
 sql.update=SQL-Update ausf\u00fchren
-sql.warning=<span class="formError">Achtung:</span> Benutzen Sie die SQL Abfragen mit Vorsicht. Benutzerfehler k\u00f6nnen zu Datenverlust und/oder Fehlfunktionen des Systems f\u00fcren..
+sql.warning=Benutzen Sie die SQL Abfragen mit Vorsicht. Benutzerfehler k\u00f6nnen zu Datenverlust und/oder Fehlfunktionen des Systems f\u00fcren.
 systemSettings.auditAlarmLevels=Audit event alarm levels
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.auth=Server erfordert Legitimation
@@ -3065,7 +3065,7 @@ viewEdit.viewDelete=L\u00f6schen:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Gr\u00f6\u00dfe
 views.newView=Neue Prozessansicht
-views.noViews=Sie haben noch kein Prozessbild. Erstellen Sie <a href="view_edit.shtm">jetzt</a> eins.
+views.noViews=Sie haben noch kein Prozessbild. Erstellen Sie
 views.title=Prozessbild
 watchlist.addNewList=Neue Beobachtungsliste
 watchlist.addToWatchlist=Zur Beobachtungsliste hinzuf\u00fcgen
@@ -3323,22 +3323,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Hinweis:
+sql.warning.prefix=Achtung:
+views.noViews.prefix=jetzt.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign Enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee Column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_en.properties b/webapp-resources/messages_en.properties
index e26b8d6edd..a85d09b224 100644
--- a/webapp-resources/messages_en.properties
+++ b/webapp-resources/messages_en.properties
@@ -756,7 +756,7 @@ dsEdit.mbus.vifeLabel=Vifes
 dsEdit.mbus.vifeLabels=Vife labels
 dsEdit.mbus.vifeTypes=Vife types
 dsEdit.meta=Meta Data Source
-dsEdit.meta.delay=Execution delay<br/>
+dsEdit.meta.delay=Execution delay
 dsEdit.meta.desc=Meta data source properties
 dsEdit.meta.event=Update event
 dsEdit.meta.event.context=Context update
@@ -1160,8 +1160,8 @@ dsEdit.validate.required=Required value
 dsEdit.viconics=Viconics Wireless Thermostats
 dsEdit.viconics.channel=Channel
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.chipRevisionBr=Chip revision
+dsEdit.viconics.commAddress=Comm address
 dsEdit.viconics.convertCelsius=Convert temperatures to celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Data source is not started
@@ -1170,9 +1170,9 @@ dsEdit.viconics.deviceRemove=Device remove (s)
 dsEdit.viconics.deviceWarning=Device offline timeone (s)
 dsEdit.viconics.devices=Devices
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Channel: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.viconics.networkIdentifyFailure=Network identify failed: {0}
 dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.networkTimeout=Network offline timeout (s)
@@ -1186,9 +1186,9 @@ dsEdit.viconics.timeout=Message timeout
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Virtual Data Source
 dsEdit.virtual.attractionPoint=Attraction point
 dsEdit.virtual.change=Change
@@ -1334,7 +1334,7 @@ emport.importProjectTitle=Import Project (Upload)
 emport.includePointValues=Include point values
 emport.indent=Indent level
 emport.invalidFile=File reading failed ({0})
-emport.invalidImportData=Import data is invalid: not a JSON object
+emport.invalidImportData=Import data is invalid: not a JSON object. (www.json.org)
 emport.invalidProjectName=Invalid name
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
 emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
@@ -1567,8 +1567,8 @@ engUnit.98=percent
 engUnit.99=percent per second
 engUnit.190=kilometers
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavolt amperes
 engUnit.abbr.100=per minute
 engUnit.abbr.101=per second
@@ -1789,7 +1789,7 @@ event.alarmMaxDecreased=Maximum alarm level has decreased from {0} to {1}
 event.alarmMaxIncreased=Maximum alarm level has increased from {0} to {1}
 event.audit.added=User "{0}" created {1} with id {2}: {3}
 event.audit.changed=User "{0}" changed {1} with id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty= {0}: "{1}" to "{2}", 
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Data point
 event.audit.dataSource=Data source
@@ -1798,7 +1798,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property= {0}="{1}", 
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2295,7 +2295,7 @@ login.nag=NOTE: you may have problems with ScadaLTS because your browser is not
 login.password=Password
 login.supportedBrowser=This browser is supported.
 login.unknownBrowser=Checking your browser for compatibility...
-login.unsupportedBrowser=Your browser may work with this product, but is not officially supported by Serotonin Software. We instead recommend the use of <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, or Internet Explorer 7
+login.unsupportedBrowser=Your browser may work with this product, but is not officially supported by Serotonin Software. We instead recommend the use of Mozilla Firefox, Google Chrome.
 login.userId=User id
 login.validation.accountDisabled=Your account has been disabled. Please contact your administrator
 login.validation.invalidLogin=Invalid login, please try again
@@ -2413,7 +2413,7 @@ pointDetails.username=Username
 pointDetails.views=Views
 pointEdit.buttons.disable=Disable
 pointEdit.buttons.enable=Enable
-pointEdit.buttons.note=<span class="smallTitle">Note:</span> saving, disabling, or restarting a point causes all active events to be returned to normal.
+pointEdit.buttons.note=saving, disabling, or restarting a point causes all active events to be returned to normal.
 pointEdit.buttons.restart=Restart
 pointEdit.chart.includeSum=Include sum
 pointEdit.chart.invalidLimit=Chart renderer: limit must be between 2 and 50
@@ -2804,7 +2804,7 @@ sql.query=Submit query
 sql.rowsUpdated=records(s) updated.      
 sql.sql=SQL
 sql.update=Submit update
-sql.warning=<span class="formError">Warning:</span> use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
+sql.warning=use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
 systemSettings.auditAlarmLevels=Audit event alarm levels
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.auth=Use authorization
@@ -3072,7 +3072,7 @@ viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Size
 views.newView=New view
-views.noViews=You have not created any graphical views. Create one <a href="view_edit.shtm">now</a>.
+views.noViews=You have not created any graphical views. Create one 
 views.title=Graphic views
 watchlist.addNewList=Add new watch list
 watchlist.addToWatchlist=Add to watch list
@@ -3326,22 +3326,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Note:
+sql.warning.prefix=Warning:
+views.noViews.prefix=now.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_es.properties b/webapp-resources/messages_es.properties
index 12d31628bd..284bafa9a4 100644
--- a/webapp-resources/messages_es.properties
+++ b/webapp-resources/messages_es.properties
@@ -13,7 +13,7 @@
 #  General Public License for more details.  
 #  
 #  You should have received a copy of the GNU General Public License  
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   
 #  This file incorporates work covered by the following copyright and  
 #  permission notice:
@@ -780,7 +780,7 @@ dsEdit.mbus.vifeTypes=Tipos de Vife
 dsEdit.mbus.vifLabel=Etiqueta Vif
 dsEdit.mbus.vifType=Tipo de Vif
 dsEdit.meta=Fuente de datos Meta
-dsEdit.meta.delay=Demorar la Ejecuci\u00f3n<br/>
+dsEdit.meta.delay=Demorar la Ejecuci\u00f3n
 dsEdit.meta.desc=Propiedades de fuente de datos Meta
 dsEdit.meta.event=Actualizar evento
 dsEdit.meta.event.context=Actualizar contexto
@@ -1145,8 +1145,8 @@ dsEdit.validate.required=Valor requerido
 dsEdit.viconics=Termostato inal\u00e1mbrico Viconics
 dsEdit.viconics.channel=Canal
 dsEdit.viconics.chipRevision=Revisi\u00f3n de Chip
-dsEdit.viconics.chipRevisionBr=Chip<br/>revisi\u00f3n
-dsEdit.viconics.commAddress=Comm<br/>direcci\u00f3n
+dsEdit.viconics.chipRevisionBr=Chip revisi\u00f3n
+dsEdit.viconics.commAddress=Comm direcci\u00f3n
 dsEdit.viconics.convertCelsius=Conversi\u00f3n de temperatura a Celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Fuente de datos no ha sido iniciada
@@ -1155,9 +1155,9 @@ dsEdit.viconics.deviceRemove=Eliminaci\u00f3n de dispositivo (s)
 dsEdit.viconics.devices=Dispositivos
 dsEdit.viconics.deviceWarning=Desconexi\u00f3n de Dispositivo por tiempo de espera (s)
 dsEdit.viconics.dpconn=Puerto: {0}, ID PAN: {1}, Canal: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revisi\u00f3n
+dsEdit.viconics.firmwareRevision=Firmware revisi\u00f3n
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Modelo<br/>n\u00famero
+dsEdit.viconics.modelNumber=Modelo n\u00famero
 dsEdit.viconics.networkIdentifyFailure=Fall\u00f3 identificaci\u00f3n de Red: {0}
 dsEdit.viconics.networkInfo=Informaci\u00f3n de la Red
 dsEdit.viconics.networkTimeout=Desconexi\u00f3n de Red por tiempo de espera (s)
@@ -1171,9 +1171,9 @@ dsEdit.viconics.timeout=Tiempo de espera del mensaje
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=El valor del Punto puede no ser confiable
 dsEdit.viconics.zigbeeFirmwareRevision=Revisi\u00f3n de Firmware de Zigbee
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Direcci\u00f3n de red de Zigbee
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Fuente de datos Virtual
 dsEdit.virtual.attractionPoint=Punto de atracci\u00f3n
 dsEdit.virtual.change=Cambio
@@ -1317,7 +1317,7 @@ emport.importProjectTitle=Importar Proyecto (Upload)
 emport.includePointValues=Incluir hist\u00f3rico de puntos
 emport.indent=Nivel de identaci\u00f3n
 emport.invalidFile=Error en la lectura del archivo ({0})
-emport.invalidImportData=Dato de importaci\u00f3n inv\u00e1lido: no es un objeto JSON
+emport.invalidImportData=Dato de importaci\u00f3n inv\u00e1lido: no es un objeto JSON. (www.json.org)
 emport.invalidProjectName=Nombre inv\u00e1lido para el Proyecto
 emport.mailingList.prefix=Prefijo de la lista de correo
 emport.mailingList.xid=Una lista de correo no tiene un valor ’xid’. Ignorado.
@@ -1550,8 +1550,8 @@ engUnit.98=porcentaje
 engUnit.99=porcentaje por segundo
 engUnit.190=kilómetros
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavoltio amperios
 engUnit.abbr.100=por minuto
 engUnit.abbr.101=por segundo
@@ -1777,7 +1777,7 @@ event.alarmMaxDecreased=Nivel m\u00e1ximo de la alarma ha sido disminuido de {0}
 event.alarmMaxIncreased=Nivel m\u00e1ximo de la alarma ha sido incrementado de {0} a {1}
 event.audit.added=Usuario "{0}" creado {1} con id {2}: {3}
 event.audit.changed=Usuario "{0}" modificado {1} con id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" a "{2}"
+event.audit.changedProperty={0}: "{1}" a "{2}"
 event.audit.compoundEventDetector=Detector de evento compuesto
 event.audit.dataPoint=Datos de punto
 event.audit.dataSource=Fuente de Datos
@@ -1786,7 +1786,7 @@ event.audit.eventHandler=Manejador de evento
 event.audit.maintenanceEvent=Evento de Mantenimiento
 event.audit.pointEventDetector=Detector de evento de punto
 event.audit.pointLink=Enlace de Punto
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}
+event.audit.property={0}
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2278,7 +2278,7 @@ login.nag=NOTA: Puede tener problemas con ScadaLTS porque su navegador no est\u0
 login.password=Contrase\u00f1a
 login.supportedBrowser=Este navegador est\u00e1 soportado.
 login.unknownBrowser=Revisando compatibilidad del navegador...
-login.unsupportedBrowser=Su navegador puede trabajar con este producto, pero no est\u00e1 oficialmente soportado por Serotonin Software. Le recomendamos que tilice <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, o Internet Explorer 7.
+login.unsupportedBrowser=Su navegador puede trabajar con este producto, pero no est\u00e1 oficialmente soportado por Serotonin Software. Le recomendamos que tilice Mozilla Firefox, Google Chrome.
 login.userId=ID de Usuario
 login.validation.accountDisabled=Su cuenta ha sido deshabilitada. Por favor contacte al administrador
 login.validation.invalidLogin=Inicio de sesi\u00f3n Inv\u00e1lido, por favor intente de nuevo.
@@ -2396,7 +2396,7 @@ pointDetails.username=Nombre de Usuario
 pointDetails.views=Vistas
 pointEdit.buttons.disable=Deshabilitar
 pointEdit.buttons.enable=Habilitar
-pointEdit.buttons.note=<span class
+pointEdit.buttons.note=guardar, deshabilitar o reiniciar un punto hace que todos los eventos activos vuelvan a la normalidad.
 pointEdit.buttons.restart=Reiniciar
 pointEdit.chart.includeSum=Incluya suma
 pointEdit.chart.invalidLimit=Generador gr\u00e1fico: El l\u00edmite debe estar entre 2 y 50
@@ -2785,7 +2785,7 @@ sql.query=Enviar consulta
 sql.rowsUpdated=Filas(s) actualizada(s).
 sql.sql=SQL
 sql.update=Enviar actualizaci\u00f3n
-sql.warning=<span class
+sql.warning=use esta instalaci\u00f3n bajo su propio riesgo. El uso incorrecto puede resultar en datos corruptos y/o fallas del sistema.
 systemSettings.auditAlarmLevels=Niveles de alarmas para eventos de auditor\u00eda 
 systemSettings.auditAlarmLevelsSaved=Los niveles de alarma de eventos auditados han sido guardados
 systemSettings.auth=Utilice autorizaci\u00f3n
@@ -3031,7 +3031,7 @@ viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Size
 views.newView=Nueva vista
-views.noViews=No se ha creado ninguna vista gr\u00e1fica. Cree una <a href="view_edit.shtm">nueva</a>.
+views.noViews=No se ha creado ninguna vista gr\u00e1fica. Cree una 
 views.title=Vistas gr\u00e1ficas
 watchlist.addNewList=Agregar nueva Lista de Supervisi\u00f3n
 watchlist.addToWatchlist=Agregar a Lista de Supervisi\u00f3n
@@ -3366,22 +3366,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Nota:
+sql.warning.prefix=Advertencia:
+views.noViews.prefix=nueva.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_fi.properties b/webapp-resources/messages_fi.properties
index c484b2341a..957b596d50 100644
--- a/webapp-resources/messages_fi.properties
+++ b/webapp-resources/messages_fi.properties
@@ -667,7 +667,7 @@ dsEdit.meta.event.week=Viikon alku
 dsEdit.meta.event.month=Kuukauden alku
 dsEdit.meta.event.year=Vuoden alku
 dsEdit.meta.event.cron=Cron-ajastus
-dsEdit.meta.delay=Suoritusviive<br/>
+dsEdit.meta.delay=Suoritusviive
 dsEdit.meta.test.success=Onnistui. tulos={0}
 dsEdit.meta.test.successTs=Onnistui. tulos={0}, aikaleima={1}
 dsEdit.meta.test.context=Yksi tai useampi piste puuttuu tai ei ole k\u00e4yt\u00f6ss\u00e4
@@ -966,16 +966,16 @@ dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.refreshing=Refreshing...
 dsEdit.viconics.rfModule=RF Module
 dsEdit.viconics.devices=Devices
-dsEdit.viconics.commAddress=Comm<br/>address
-dsEdit.viconics.modelNumber=Model<br/>number
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.commAddress=Comm address
+dsEdit.viconics.modelNumber=Model number
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
+dsEdit.viconics.chipRevisionBr=Chip revision
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
@@ -1096,7 +1096,7 @@ emport.importProgress=Tuonti k\u00e4ynniss\u00e4...
 emport.importCancelled=Tuonti peruttu
 emport.importComplete=Tuonti valmis
 emport.noMessages=Ei tulosviesti\u00e4. Ei mit\u00e4\u00e4n tuotavaa?
-emport.invalidImportData=Tuotava tieto on virheellinen: Ei JSON-objekti
+emport.invalidImportData=Tuotava tieto on virheellinen: Ei JSON-objekti. (www.json.org)
 emport.parseError=JSON j\u00e4sennysvirhe: {0}
 emport.user.username=K\u00e4ytt\u00e4j\u00e4ll\u00e4 ei ole ’username’-arvoa. J\u00e4tet\u00e4\u00e4n huomioimatta.
 emport.user.prefix=K\u00e4ytt\u00e4j\u00e4 ''{0}'': {1}
@@ -1270,8 +1270,7 @@ login.loginButton=Kirjaudu
 login.unknownBrowser=Tarkistetaan selaimen yhteensopivuus...
 login.supportedBrowser=T\u00e4m\u00e4 selain on tuettu.
 login.unsupportedBrowser=Selaimesi voi toimia, mutta ei ole viralliesti Serotonin Softwaren tukema. \
- Suosittelemme k\u00e4ytt\u00e4m\u00e4\u00e4n <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, tai \
-Internet Explorer 7.
+ Suosittelemme k\u00e4ytt\u00e4m\u00e4\u00e4n Mozilla Firefox, Google Chrome.
 login.nag=Huom: Koska selaimesi ei ole virallisesti tuettu, on mahdollista, ett\u00e4 aiheutuu ongelmia ScadaLTS kanssa. Kehotamme  p\u00e4ivitt\u00e4m\u00e4\u00e4n selaimen.  
 
 mailingLists.added=Postituslista lis\u00e4tty
@@ -1375,7 +1374,7 @@ pointDetails.accessType=P\u00e4\u00e4sy
 pointEdit.buttons.enable=P\u00e4\u00e4lle
 pointEdit.buttons.disable=Pois k\u00e4yt\u00f6st\u00e4
 pointEdit.buttons.restart=Uudelleenk\u00e4ynnistys
-pointEdit.buttons.note=<span class="smallTitle">Huom:</span> Pisteen tallentaminen, sammuttaminen tai uudelleenk\u00e4ynnistys asettaa kaikki tapahtumat takaisin normaaliin.
+pointEdit.buttons.note=pisteen tallentaminen, sammuttaminen tai uudelleenk\u00e4ynnistys asettaa kaikki tapahtumat takaisin normaaliin.
 
 pointEdit.chart.props=Kaavion asetukset
 pointEdit.chart.type=Tyyppi
@@ -1725,7 +1724,7 @@ scheduledEvents.validate.inactiveTrigger=Virhe luotaessa palautumisliipaisin: {0
 scheduledEvents.validate.aliasTooLong=Alias ei voi olla pidempi kuin 50 merkki\u00e4
 scheduledEvents.validate.invalidRtn=Palautumisaika pit\u00e4\u00e4 olla ennen aktivointiaikaa
 
-sql.warning=<span class="formError">Varoitus:</span> k\u00e4yt\u00e4 t\u00e4t\u00e4 ominaisuutta omalla vastuulla. Virheellinen k\u00e4ytt\u00f6 voi aiheuttaa tietojen h\u00e4vi\u00e4mist\u00e4 ja/tai j\u00e4rjestelm\u00e4vian. 
+sql.warning= k\u00e4yt\u00e4 t\u00e4t\u00e4 ominaisuutta omalla vastuulla. Virheellinen k\u00e4ytt\u00f6 voi aiheuttaa tietojen h\u00e4vi\u00e4mist\u00e4 ja/tai j\u00e4rjestelm\u00e4vian. 
 sql.sql=SQL
 sql.query=L\u00e4het\u00e4 kysely
 sql.update=L\u00e4het\u00e4 p\u00e4ivitys
@@ -1907,7 +1906,7 @@ viewEdit.compound.duration=Jakso
 
 views.title=Graafiset n\u00e4yt\u00f6t
 views.newView=Uusi n\u00e4ytt\u00f6
-views.noViews=Et ole luonut viel\u00e4 yht\u00e4\u00e4n n\u00e4ytt\u00f6\u00e4. Tee <a href="view_edit.shtm">nyt</a>.
+views.noViews=Et ole luonut viel\u00e4 yht\u00e4\u00e4n n\u00e4ytt\u00f6\u00e4. Tee 
 
 watchlist.addToWatchlist=Lis\u00e4\u00e4 seurantaan
 watchlist.points=Pisteet
@@ -2018,7 +2017,7 @@ event.system.process=Prosessi-tapahtuman virhe
 
 event.audit.added=K\u00e4ytt\u00e4j\u00e4 "{0}" loi kohteen "{1} Id:{2}", asetuksilla: {3}
 event.audit.changed=K\u00e4ytt\u00e4j\u00e4 "{0}" muutti kohteen "{1} Id:{2}", asetuksia: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" --> "{2}"
+event.audit.changedProperty={0}: "{1}" --> "{2}"
 event.audit.compoundEventDetector=Yhdistem\u00e4tapahtuma
 event.audit.dataPoint=Piste
 event.audit.dataSource=Datal\u00e4hde
@@ -2027,7 +2026,7 @@ event.audit.eventHandler=Tapahtumak\u00e4sittelij\u00e4
 event.audit.maintenanceEvent=Yll\u00e4pitotapahtuma
 event.audit.pointEventDetector=Pistetapahtuma
 event.audit.pointLink=Pistelinkki
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2587,8 +2586,8 @@ engUnit.188=newtons per meter
 engUnit.189=watts per meter per degree kelvin
 engUnit.190=kilometers
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.2=mA
 engUnit.abbr.3=A
 engUnit.abbr.4=ohms
@@ -3452,22 +3451,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Huom:
+sql.warning.prefix=Varoitus:
+views.noViews.prefix=nyt.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_fr.properties b/webapp-resources/messages_fr.properties
index f47047eb31..c9705db2c1 100644
--- a/webapp-resources/messages_fr.properties
+++ b/webapp-resources/messages_fr.properties
@@ -732,7 +732,7 @@ dsEdit.mbus.vifeTypes=Types Vif
 dsEdit.mbus.vifLabel=Etiquette vif 
 dsEdit.mbus.vifType=Type Vif 
 dsEdit.mbus=MBus
-dsEdit.meta.delay=Délai d’éxécution<br/>
+dsEdit.meta.delay=Délai d’éxécution 
 dsEdit.meta.desc=Propriétés de source de données Meta
 dsEdit.meta.event.context=Mise à jour de contexte
 dsEdit.meta.event.cron=Modèle Cron
@@ -1077,8 +1077,8 @@ dsEdit.updatePeriod=Mise à jour période
 dsEdit.validate.required=Valeur requise
 dsEdit.viconics.channel=Canal viconics
 dsEdit.viconics.chipRevision=Révision Chip viconics			
-dsEdit.viconics.chipRevisionBr=Chip<br/>révision viconics
-dsEdit.viconics.commAddress=Comm<br/>adresse viconics
+dsEdit.viconics.chipRevisionBr=Chip révision viconics
+dsEdit.viconics.commAddress=Comm adresse viconics
 dsEdit.viconics.convertCelsius=Convertir températures en Celsius
 dsEdit.viconics.crss=CRSS Viconics
 dsEdit.viconics.dataSourceNotStarted=Source des données n’est pas démarré
@@ -1087,9 +1087,9 @@ dsEdit.viconics.deviceRemove=supprimer le périphérique (s)
 dsEdit.viconics.devices=Périphériques viconics
 dsEdit.viconics.deviceWarning=Délai de périphérique déconnecté(s)
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Canal: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>révision
+dsEdit.viconics.firmwareRevision=Firmware révision
 dsEdit.viconics.ieee=IEEE viconics
-dsEdit.viconics.modelNumber=Model<br/>numéro
+dsEdit.viconics.modelNumber=Model numéro
 dsEdit.viconics.networkIdentifyFailure=Identification réseau échoué: {0}
 dsEdit.viconics.networkInfo=Information réseau
 dsEdit.viconics.networkTimeout=Délai de réseau déconnecté(s)
@@ -1103,9 +1103,9 @@ dsEdit.viconics.timeout=Délai message viconics
 dsEdit.viconics.trss=TRSS viconics
 dsEdit.viconics.unreliable=Valeur du point peut ne pas être fiable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee révision firmware 
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>révision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware révision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee adresse réseau
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>adresse
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network adresse
 dsEdit.viconics=Viconics thermostats sans fil
 dsEdit.virtual.attractionPoint=Point d’attraction
 dsEdit.virtual.change=Changement virtuelle
@@ -1250,7 +1250,7 @@ emport.importProjectTitle=Importer projet (Upload)
 emport.includePointValues=Inclure valeurs de points
 emport.indent=Niveau de retrait
 emport.invalidFile=Lecture de fichier échoué ({0})
-emport.invalidImportData=Importer des données n’est pas valide: n’est pas un objet JSON
+emport.invalidImportData=Importer des données n’est pas valide: n’est pas un objet JSON. (www.json.org)
 emport.invalidProjectName=Nom invalide
 emport.mailingList.prefix=Liste de diffusion ''{0}'': {1}
 emport.mailingList.xid=Une liste de diffusion n’a pas de valeur ‘xid’. Ignoré.
@@ -1483,8 +1483,8 @@ engUnit.99=pourcent par seconde
 engUnit.190=kilomètres
 engUnit.abbr.190=km
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=mégavolt ampères
 engUnit.abbr.100=par minute
 engUnit.abbr.101=par seconde
@@ -1705,7 +1705,7 @@ event.alarmMaxDecreased=Niveau d’alarme maximal a diminué de {0} vers {1}
 event.alarmMaxIncreased=Niveau d’alarme maximal a augmenté de {0} vers {1}
 event.audit.added=Utilisateur ""{0}"" créé {1} avec id {2}: {3}
 event.audit.changed=Utilisateur ""{0}"" changé {1} avec id {2}: {3}
-event.audit.changedProperty=<br/>""{0}"" ""{1}"" à ""{2}""
+event.audit.changedProperty= ""{0}"" ""{1}"" à ""{2}""
 event.audit.compoundEventDetector=Détecteur d’évènement du composé
 event.audit.dataPoint=Point de données
 event.audit.dataSource=Source de données
@@ -1714,7 +1714,7 @@ event.audit.eventHandler=Gestionnaire d’évènements
 event.audit.maintenanceEvent=Évènement de maintenance
 event.audit.pointEventDetector=Point de détecteur d’évènements
 event.audit.pointLink=Point de lien
-event.audit.property=<br/>""{0}""=""{1}""
+event.audit.property= ""{0}""=""{1}""
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2191,7 +2191,7 @@ login.nag=NOTE: vous pouvez avoir des problèmes avec ScadaLTS parce que votre n
 login.password=Mot de passe
 login.supportedBrowser=Ce navigateur est supporté.
 login.unknownBrowser=Vérification de votre navigateur pour la compatibilité...
-login.unsupportedBrowser=Ce navigateur devrait fonctionner, mais n’est pas officiellement supporté. Nous vous recommandons d’utiliser <a href=""http://www.mozilla.com/"" target=""_blank"">Firefox</a> ou Chrome.
+login.unsupportedBrowser=Ce navigateur devrait fonctionner, mais n'est pas officiellement supporté. Nous vous recommandons d'utiliser Mozilla Firefox, Google Chrome.
 login.userId=Id de l’utilisateur
 login.validation.accountDisabled=Votre compte a été désactivé. S’il vous plaît contactez votre administrateur
 login.validation.invalidLogin=Connexion incorrecte, s&rsquo;il vous plaît essayer à nouveau
@@ -2247,7 +2247,7 @@ maintenanceEvents.type.year=Annuel
 maintenanceEvents.type=Type planifié
 maintenanceEvents.validate.activeCron=Erreur dans l’expression cron active: {0}
 maintenanceEvents.validate.activeTrigger=Erreur de création de déclencheur actif: {0}
-maintenanceEvents.validate.aliasTooLong=Alias trop long <ne peut pas contenir plus de 50 caractères>
+maintenanceEvents.validate.aliasTooLong=Alias trop long (ne peut pas contenir plus de 50 caractères)
 maintenanceEvents.validate.inactiveCron=Erreur dans l’expression cron inactive: {0}
 maintenanceEvents.validate.inactiveTrigger=Erreur de création de déclencheur inactif: {0}
 maintenanceEvents.validate.invalidRtn=Temps d’inactivité doit être après le temps d’activité
@@ -2303,7 +2303,7 @@ pointDetails.username=Nom d’utilisateur
 pointDetails.views=Vues
 pointEdit.buttons.disable=Déscativer
 pointEdit.buttons.enable=Activer
-pointEdit.buttons.note=<span class=""smallTitle"">Note:</span> la sauvegarde, la désactivation, ou le redémarrage d’un point entraîne tous les évènements actifs à retourner à la normale
+pointEdit.buttons.note=la sauvegarde, la désactivation, ou le redémarrage d’un point entraîne tous les évènements actifs à retourner à la normale
 pointEdit.buttons.restart=Redémarrer
 pointEdit.chart.includeSum=Inclure somme
 pointEdit.chart.invalidLimit=Tableau rendu: limite doit être entre 2 et 50
@@ -2665,7 +2665,7 @@ sql.query=Envoyer requête
 sql.rowsUpdated=Enregistrement(s) à jour.      
 sql.sql=SQL
 sql.update=Envoyer mise à jour
-sql.warning=<span class=""formError"">Attention:</span> utiliser cette fonction à vos risques. Une utilisation incorrecte peut entraîner des données corrompues et/ou des failles de système. 
+sql.warning=utiliser cette fonction à vos risques. Une utilisation incorrecte peut entraîner des données corrompues et/ou des failles de système. 
 systemSettings.auditAlarmLevels=Niveaux d’alarmes d’évènements d’audit
 systemSettings.auditAlarmLevelsSaved=Niveaux d’alarmes d’évènements d’audit ont été sauvegardés
 systemSettings.auth=Autorisation d’utilisation
@@ -2898,7 +2898,7 @@ viewEdit.viewDelete=Supprimer la vue:
 viewEdit.viewDeleteConfirm=Confirmer
 viedEdit.viewSize=La Taille
 views.newView=Nouvelle vue
-views.noViews=Vous n’avez pas créé de vues graphiques. En créer <a href=""view_edit.shtm"">now</a>.
+views.noViews=Vous n'avez pas créé de vues graphiques. En créer 
 views.title=Vues de graphique
 watchlist.addNewList=Ajouter nouvelle liste de surveillance
 watchlist.addToWatchlist=Ajouter à la liste de surveillance
@@ -3320,22 +3320,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Note:
+sql.warning.prefix=Attention:
+views.noViews.prefix=maintenant.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_lu.properties b/webapp-resources/messages_lu.properties
index e4db6550cd..be6f8dcf5f 100644
--- a/webapp-resources/messages_lu.properties
+++ b/webapp-resources/messages_lu.properties
@@ -775,7 +775,7 @@ dsEdit.mbus.vifeLabel=Vifes
 dsEdit.mbus.vifeLabels=Vife Label
 dsEdit.mbus.vifeTypes=Vife Typen
 dsEdit.meta=Meta Datenquell
-dsEdit.meta.delay=Berechnungsverz\u00f6gerung</br>
+dsEdit.meta.delay=Berechnungsverz\u00f6gerung
 dsEdit.meta.desc=Meta Datenquell Konfiguratioun
 dsEdit.meta.event=Aktualis\u00e9ierungsereegnis
 dsEdit.meta.event.context=\u00c4nnerung vun den Agangsvariablen
@@ -1179,8 +1179,8 @@ dsEdit.validate.required=Required value
 dsEdit.viconics=Viconics Wireless Thermostats
 dsEdit.viconics.channel=Channel
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.chipRevisionBr=Chip revision
+dsEdit.viconics.commAddress=Comm address
 dsEdit.viconics.convertCelsius=Convert temperatures to celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Data source is not started
@@ -1189,9 +1189,9 @@ dsEdit.viconics.deviceRemove=Device remove (s)
 dsEdit.viconics.deviceWarning=Device offline timeone (s)
 dsEdit.viconics.devices=Devices
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Channel: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.viconics.networkIdentifyFailure=Network identify failed: {0}
 dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.networkTimeout=Network offline timeout (s)
@@ -1205,9 +1205,9 @@ dsEdit.viconics.timeout=Message timeout
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Virtuell Datenquell
 dsEdit.virtual.attractionPoint=Datenpunkt Attraktor
 dsEdit.virtual.change=\u00c4nnerung
@@ -1353,7 +1353,7 @@ emport.importProjectTitle=Import Project (Upload)
 emport.includePointValues=Include point values
 emport.indent=Ar\u00e9ckung
 emport.invalidFile=File reading failed ({0})
-emport.invalidImportData=Fir ze import\u00e9ierend Daten sinn ong\u00fclteg: keen <a href="www.json.org">JSON</a> objet.
+emport.invalidImportData=Fir ze import\u00e9ierend Daten sinn ong\u00fclteg: keen JSON objet. (www.json.org)
 emport.invalidProjectName=Invalid name
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
 emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
@@ -1586,8 +1586,8 @@ engUnit.98=percent
 engUnit.99=percent per second
 engUnit.190=kilometers
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavolt amperes
 engUnit.abbr.100=per minute
 engUnit.abbr.101=per second
@@ -1808,7 +1808,7 @@ event.alarmMaxDecreased=H\u00e9chsten Alarmpriorit\u00e9it huet sech vun {0} op
 event.alarmMaxIncreased=H\u00e9chsten Alarmpriorit\u00e9it huet sech vun {0} op {1} erh\u00e9icht
 event.audit.added=Benotzer "{0}" huet {1} mat id {2}: {3} erzeugt
 event.audit.changed=Benotzer "{0}" huet {1} mat id {2}: {3} ge\u00e4nnert
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" zu "{2}"
+event.audit.changedProperty={0}: "{1}" zu "{2}"
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Datenpunkt
 event.audit.dataSource=Datenquell
@@ -1817,7 +1817,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2122,8 +2122,8 @@ eventHandlers.invalidInactiveSourceType=Invalid inactive source point data type
 eventHandlers.invalidInactiveValue=Invalid inactive value to set
 eventHandlers.invalidScripts=Selecione ao menos um script
 eventHandlers.maintenanceEvents=Maintenance events
-eventHandlers.noEmailRecips=Keen Email Empf\u00e4nger!<br>Dir musst mindestens een Email Empf\u00e4nger b\u00e4if\u00fcgen
-eventHandlers.noEscalRecips=Keng Eskalatiouns Email Empf\u00e4nger!<br>Dir musst mindestens een Eskalatiouns Email Empf\u00e4nger b\u00e4if\u00fcgen
+eventHandlers.noEmailRecips=Keen Email Empf\u00e4nger! Dir musst mindestens een Email Empf\u00e4nger b\u00e4if\u00fcgen
+eventHandlers.noEscalRecips=Keng Eskalatiouns Email Empf\u00e4nger! Dir musst mindestens een Eskalatiouns Email Empf\u00e4nger b\u00e4if\u00fcgen
 eventHandlers.noInactiveRecips=You must add inactive recipients
 eventHandlers.noSetPointAction=No set point action has been defined
 eventHandlers.noTargetPoint=No target point selected. You may not have any settable points defined.
@@ -2348,7 +2348,7 @@ login.nag=Hiweis: et ass m\u00e9iglech dat Dir Problemer mat ScadaLTS hutt, well
 login.password=Passwuert
 login.supportedBrowser=D\u00ebse Browser g\u00ebtt \u00ebnnerst\u00ebtzt
 login.unknownBrowser=Onbekannte Browser
-login.unsupportedBrowser=D\u00ebse Browser g\u00ebtt offiziell net vun Serotonin Software \u00ebnnerst\u00ebtzt. Mir empfielen <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, oder  Internet Explorer 7.
+login.unsupportedBrowser=D\u00ebse Browser g\u00ebtt offiziell net vun Serotonin Software \u00ebnnerst\u00ebtzt. Mir empfielen Mozilla Firefox, Google Chrome.
 login.userId=Benotzernumm
 login.validation.accountDisabled=\u00c4ren Account gouf gespaart, wennt Iech w.e.g un \u00c4ren Administrator
 login.validation.invalidLogin=Login gescheitert, bitte prob\u00e9iert et nach eng K\u00e9ier
@@ -2466,7 +2466,7 @@ pointDetails.username=Benotzernumm
 pointDetails.views=Usichten
 pointEdit.buttons.disable=Ausschalten
 pointEdit.buttons.enable=Aschalten
-pointEdit.buttons.note=<span class="smallTitle">Hinweis:</span> sp\u00e4icheren, deaktiv\u00e9ieren oder nei starten setzen all aktiven Ereegnisse zer\u00e9ck.
+pointEdit.buttons.note=sp\u00e4icheren, deaktiv\u00e9ieren oder nei starten setzen all aktiven Ereegnisse zer\u00e9ck.
 pointEdit.buttons.restart=Neistart
 pointEdit.chart.includeSum=Zomm berechnen
 pointEdit.chart.invalidLimit=Tabell: Unzuel muss zw\u00ebschen 2 an 50 leien
@@ -2856,7 +2856,7 @@ sql.query=SQL-Offro starten
 sql.rowsUpdated=Datens\u00e4tz aktualis\u00e9iert
 sql.sql=SQL
 sql.update=SQL-Update ausf\u00e9ieren
-sql.warning=<span class="formError">Achtung:</span> Benotzt d&rsquo;SQL Offro mat Virsiicht. Benotzerfehler kennen zu Datenverloscht an/oder Fehlfunktiounen vum System f\u00e9ieren..
+sql.warning=Benotzt d'SQL Offro mat Virsiicht. Benotzerfehler kennen zu Datenverloscht an/oder Fehlfunktiounen vum System f\u00e9ieren.
 systemSettings.auditAlarmLevels=Audit event alarm levels
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.auth=Server erfuerdert Legitimatioun
@@ -3129,7 +3129,7 @@ viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Size
 views.newView=Nei Prozessusicht
-views.noViews=Dir hutt nach kee Prozessbild. Erstellt een <a href="view_edit.shtm">jetzt</a> .
+views.noViews=Dir hutt nach kee Prozessbild. Erstellt een 
 views.title=Prozessbild
 watchlist.addNewList=Nei Beobachtungslescht
 watchlist.addToWatchlist=Zur Beobachtungslescht b\u00e4if\u00fcgen
@@ -3339,22 +3339,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Hinweis:
+sql.warning.prefix=Warnung:
+views.noViews.prefix=elo.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_nl.properties b/webapp-resources/messages_nl.properties
index b3d75e2951..8e97b71105 100644
--- a/webapp-resources/messages_nl.properties
+++ b/webapp-resources/messages_nl.properties
@@ -665,7 +665,7 @@ dsEdit.meta.event.week=Start van week
 dsEdit.meta.event.month=Start van maand
 dsEdit.meta.event.year=Start van jaar
 dsEdit.meta.event.cron=Cron patroon
-dsEdit.meta.delay=Uitvoering vertraging<br/>
+dsEdit.meta.delay=Uitvoering vertraging 
 dsEdit.meta.test.success=Succes. resultaat={0}
 dsEdit.meta.test.successTs=Success. resultaat={0}, tijdstempel={1}
 dsEdit.meta.test.context=Een of meer punten zijn uitgeschakeld of missen
@@ -947,16 +947,16 @@ dsEdit.viconics.networkInfo=Netwerk informatie
 dsEdit.viconics.refreshing=Verversen...
 dsEdit.viconics.rfModule=RF Module
 dsEdit.viconics.devices=Devices
-dsEdit.viconics.commAddress=Comm<br/>adres
-dsEdit.viconics.modelNumber=Model<br/>nummer
-dsEdit.viconics.firmwareRevision=Firmware<br/>revisie
+dsEdit.viconics.commAddress=Comm adres
+dsEdit.viconics.modelNumber=Model nummer
+dsEdit.viconics.firmwareRevision=Firmware revisie
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revisie
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revisie
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revisie
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee netwerk adres
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>netwerk<br/>adres
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee netwerk adres
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=Chip revisie
-dsEdit.viconics.chipRevisionBr=Chip<br/>revisie
+dsEdit.viconics.chipRevisionBr=Chip revisie
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 
@@ -1075,7 +1075,7 @@ emport.importProgress=Bezig met importeren...
 emport.importCancelled=Import afgebroken
 emport.importComplete=Import gereed
 emport.noMessages=Geen resultaat bericht. Niets te importeren ?
-emport.invalidImportData=Import data is ongeldig: geen JSON object
+emport.invalidImportData=Import data is ongeldig: geen JSON object. (www.json.org)
 emport.parseError=JSON parse fout: {0}
 emport.user.username=Een gebruiker heeft geen ’gebruiker’ waarde. Genegeerd.
 emport.user.prefix=Gebruiker ''{0}'': {1}
@@ -1228,8 +1228,7 @@ login.loginButton=Inloggen
 login.unknownBrowser=Bezig met controleren browser voor compatibiliteit...
 login.supportedBrowser=Deze browser is ondersteund.
 login.unsupportedBrowser=Het kan zijn dat uw browser wel werkt met dit product, maar het is niet officieel ondersteund door Serotonin \
-Software. Wij adviseren het gebruik van <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, of \
-Internet Explorer 7.
+Software. Wij adviseren het gebruik van Mozilla Firefox, Google Chrome.
 login.nag=NB: Het kan zijn dat u problemen ondervindt met ScadaLTS omdat uw browser niet officieel is ondersteund. Upgrade uw browser s.v.p.  
 
 mailingLists.added=Mailing lijst toegevoegd
@@ -1297,7 +1296,7 @@ pointDetails.accessType=Toegangstype
 pointEdit.buttons.enable=Inschakelen
 pointEdit.buttons.disable=Uitschakelen
 pointEdit.buttons.restart=Herstart
-pointEdit.buttons.note=<span class="smallTitle">Noot:</span> opslaan, uitschakelen, of herstarten van een punt heeft tot gevolg dat alle actieve gebeurtenissen terugkeren naar normaal.
+pointEdit.buttons.note=opslaan, uitschakelen, of herstarten van een punt heeft tot gevolg dat alle actieve gebeurtenissen terugkeren naar normaal.
 
 pointEdit.chart.props=Grafiek generator eigenschappen
 pointEdit.chart.type=Type
@@ -1647,7 +1646,7 @@ scheduledEvents.validate.inactiveTrigger=Fout bij aanmaken inactieve trigger: {0
 scheduledEvents.validate.aliasTooLong=Alias kan niet langer zijn dan 50 karakters
 scheduledEvents.validate.invalidRtn=Inactief tijd moet na actief tijd komen
 
-sql.warning=<span class="formError">Waarschuwing:</span> gebruik deze faciliteit op eigen risico. Incorrect gebruik kan leiden tot beschadigde data en/of systeem storing.
+sql.warning=gebruik deze faciliteit op eigen risico. Incorrect gebruik kan leiden tot beschadigde data en/of systeem storing.
 sql.sql=SQL
 sql.query=Invoeren query
 sql.update=Invoeren update
@@ -1816,7 +1815,7 @@ viewEdit.compound.duration=Duur
 
 views.title=Grafische views
 views.newView=Nieuwe view
-views.noViews=Er zijn nog geen grafische views aangemaakt. Maak er <a href="view_edit.shtm">nu</a> een aan.
+views.noViews=Er zijn nog geen grafische views aangemaakt. Maak er 
 
 viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
@@ -1918,7 +1917,7 @@ event.system.process=Proces gebeurtenis handler gefaald
 
 event.audit.added=User "{0}" aangemaakt {1} met id {2}: {3}
 event.audit.changed=User "{0}" veranderd {1} met id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty={0}: "{1}" to "{2}"
 event.audit.compoundEventDetector=Samengestelde gebeurtenis detector
 event.audit.dataPoint=Data punt
 event.audit.dataSource=Data bron
@@ -1927,7 +1926,7 @@ event.audit.eventHandler=Gebeurtenis handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Punt gebeurtenis detector
 event.audit.pointLink=Punt link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2482,8 +2481,8 @@ engUnit.188=newton per meter
 engUnit.189=watt per meter per graden kelvin
 engUnit.190=kilometers
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.2=mA
 engUnit.abbr.3=A
 engUnit.abbr.4=ohms
@@ -3442,22 +3441,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Noot:
+sql.warning.prefix=Waarschuwing:
+views.noViews.prefix=nu een aan.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_pl.properties b/webapp-resources/messages_pl.properties
index a699b8f785..a3c48860de 100644
--- a/webapp-resources/messages_pl.properties
+++ b/webapp-resources/messages_pl.properties
@@ -679,7 +679,7 @@ dsEdit.meta.event.week=Start of week
 dsEdit.meta.event.month=Start of month
 dsEdit.meta.event.year=Start of year
 dsEdit.meta.event.cron=Cron pattern
-dsEdit.meta.delay=Execution delay<br/>
+dsEdit.meta.delay=Execution delay
 dsEdit.meta.test.success=Success. result={0}
 dsEdit.meta.test.successTs=Success. result={0}, timestamp={1}
 dsEdit.meta.test.context=One or more points are disabled or missing
@@ -983,16 +983,16 @@ dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.refreshing=Refreshing...
 dsEdit.viconics.rfModule=RF Module
 dsEdit.viconics.devices=Devices
-dsEdit.viconics.commAddress=Comm<br/>address
-dsEdit.viconics.modelNumber=Model<br/>number
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.commAddress=Comm address
+dsEdit.viconics.modelNumber=Model number
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
+dsEdit.viconics.chipRevisionBr=Chip revision
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
@@ -1135,7 +1135,7 @@ emport.importProgress=Import in progress...
 emport.importCancelled=Import cancelled
 emport.importComplete=Import complete
 emport.noMessages=No result message. Nothing to import?
-emport.invalidImportData=Import data is invalid: not a JSON object
+emport.invalidImportData=Import data is invalid: not a JSON object. (www.json.org)
 emport.parseError=JSON parse error: {0}
 emport.user.username=A user does not have a ’username’ value. Ignored.
 emport.user.prefix=User ''{0}'': {1}
@@ -1309,8 +1309,7 @@ login.validation.accountDisabled=twoje konto zosta\u0142o zablokowane. Skontaktu
 login.loginButton=Zaloguj
 login.unknownBrowser=Kontrola zgodno\u015bci przegl\u0105darki...
 login.supportedBrowser=Ta przegl\u0105darka jest obs\u0142ugiwana.
-login.unsupportedBrowser=Twoja przegl\u0105darka mo\u017ce dzia\u0142a\u0107 poprawnie, ale nie jest oficjalnie wspierana. Rekomendujemy u\u017cywanie <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, lub \
-Internet Explorer 7.
+login.unsupportedBrowser=Twoja przegl\u0105darka mo\u017ce dzia\u0142a\u0107 poprawnie, ale nie jest oficjalnie wspierana. Rekomendujemy u\u017cywanie Mozilla Firefox, Google Chrome.
 login.nag=NOTATKA: mo\u017cesz mie\u0107 problemy poniewa\u017c u\u017cywasz nie wspieranej przegl\u0105darki.  
 
 mailingLists.added=Lista mail’ingowa dodana
@@ -1414,7 +1413,7 @@ pointDetails.accessType=Typ dost\u0119pu
 pointEdit.buttons.enable=Odblokuj
 pointEdit.buttons.disable=Zablokuj
 pointEdit.buttons.restart=Zrestartuj
-pointEdit.buttons.note=<span class="smallTitle">Notatka:</span> saving, disabling, or restarting a point causes all active events to be returned to normal.
+pointEdit.buttons.note=saving, disabling, or restarting a point causes all active events to be returned to normal.
 
 pointEdit.chart.props=Chart renderer properties
 pointEdit.chart.type=Type
@@ -1732,7 +1731,7 @@ scheduledEvents.validate.inactiveTrigger=Error creating inactive trigger: {0}
 scheduledEvents.validate.aliasTooLong=Alias cannot be longer than 50 characters
 scheduledEvents.validate.invalidRtn=Inactive time must be after active time
 
-sql.warning=<span class="formError">Warning:</span> use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
+sql.warning=use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
 sql.sql=SQL
 sql.query=Submit query
 sql.update=Submit update
@@ -1764,7 +1763,7 @@ systemSettings.systemAlarmLevels=Poziomy alarmowe zdarze\u0144 systemowych
 systemSettings.auditAlarmLevels=Poziomy alarmowe punkt\u00f3w danych
 systemSettings.otherSettings=Inne ustawienia
 systemSettings.purgeEvents=Usu\u0144 zdarzenia starsze ni\u017c
-systemSettings.purgeReports=PUsu\u0144 raporty starsze ni\u017c
+systemSettings.purgeReports=Usu\u0144 raporty starsze ni\u017c
 systemSettings.uiPerformance=Wydajno\u015b\u0107 interfejsu u\u017cytkownika
 systemSettings.uiPerformance.high=Wysoka
 systemSettings.uiPerformance.med=\u015arednia
@@ -1915,7 +1914,7 @@ viewEdit.fullScreen=Pe\u0142ny ekran
 
 views.title=Schematy
 views.newView=Nowy schemat
-views.noViews=Nie masz \u017cadnych schamt\u00f3w.Utw\u00f3rz <a href="view_edit.shtm">teraz</a>.
+views.noViews=Nie masz \u017cadnych schemat\u00f3w. Utw\u00f3rz 
 
 watchlist.addToWatchlist=Dodaj do listy
 watchlist.points=Punkty
@@ -2001,7 +2000,7 @@ event.system.process=B\u0142\u0105d obs\u0142ugi zdarzenia
 
 event.audit.added=User "{0}" created {1} with id {2}: {3}
 event.audit.changed=User "{0}" changed {1} with id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty={0}: "{1}" to "{2}"
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Data point
 event.audit.dataSource=Data source
@@ -2010,7 +2009,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2569,8 +2568,8 @@ engUnit.188=newtons per meter
 engUnit.189=watts per meter per degree kelvin
 engUnit.190=kilometers
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.2=mA
 engUnit.abbr.3=A
 engUnit.abbr.4=ohms
@@ -3092,7 +3091,7 @@ users.theme.dark=Ciemny
 viewEdit.moveDownComponent=Send to back
 viewEdit.moveUpComponent=Bring to front
 emport.profilePermission.prefix=Uprawnienia dla profilu ''{0}'': {1}
-dox.anonymousView=Dost0119p anonimowy
+dox.anonymousView=Dost\u0119p anonimowy
 viewEdit.position.x=Położenie X
 viewEdit.position.y=Położenie Y
 
@@ -3464,22 +3463,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Notatka:
+sql.warning.prefix=Ostrzeżenie:
+views.noViews.prefix=teraz.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
 event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_pt.properties b/webapp-resources/messages_pt.properties
index 31c3f5cb20..ea980cd248 100644
--- a/webapp-resources/messages_pt.properties
+++ b/webapp-resources/messages_pt.properties
@@ -685,7 +685,7 @@ dsEdit.meta.event.week=In\u00edcio da semana
 dsEdit.meta.event.month=In\u00edcio do m\u00eas
 dsEdit.meta.event.year=In\u00edcio do ano
 dsEdit.meta.event.cron=Padr\u00e3o cron
-dsEdit.meta.delay=Atraso de execu\u00e7\u00e3o<br/>
+dsEdit.meta.delay=Atraso de execu\u00e7\u00e3o
 dsEdit.meta.test.success=Successo. resultado={0}
 dsEdit.meta.test.successTs=Successo. resultado={0}, timestamp={1}
 dsEdit.meta.test.context=Um ou mais pontos est\u00e3o desabilitados ou faltando
@@ -993,16 +993,16 @@ dsEdit.viconics.networkInfo=Informa\u00e7\u00e3o da rede
 dsEdit.viconics.refreshing=Atualizando...
 dsEdit.viconics.rfModule=M\u00f3dulo RF
 dsEdit.viconics.devices=Dispositivos
-dsEdit.viconics.commAddress=Endere\u00e7os<br/>Comm
-dsEdit.viconics.modelNumber=N\u00famero de<br/>modelo
-dsEdit.viconics.firmwareRevision=Revis\u00e3o de<br/>Firmware
+dsEdit.viconics.commAddress=Endere\u00e7os Comm
+dsEdit.viconics.modelNumber=N\u00famero de modelo
+dsEdit.viconics.firmwareRevision=Revis\u00e3o de Firmware
 dsEdit.viconics.zigbeeFirmwareRevision=Revis\u00e3o de firmware Zigbee
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Revis\u00e3o de<br/>firmware<br/>Zigbee
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Revis\u00e3o de firmware Zigbee
 dsEdit.viconics.zigbeeNetworkAddress=Endere\u00e7o de rede Zigbee
-dsEdit.viconics.zigbeeNetworkAddressBr=Endere\u00e7o de<br/>rede<br/>Zigbee
+dsEdit.viconics.zigbeeNetworkAddressBr=Endere\u00e7o de rede Zigbee
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=Revis\u00e3o do Chip
-dsEdit.viconics.chipRevisionBr=Revis\u00e3o do<br/>chip
+dsEdit.viconics.chipRevisionBr=Revis\u00e3o do chip
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.unreliable=Valor do ponto pode n\u00e3o ser confi\u00e1vel
@@ -1204,7 +1204,7 @@ emport.importProgress=Importa\u00e7\u00e3o em progresso...
 emport.importCancelled=Importa\u00e7\u00e3o cancelada
 emport.importComplete=Importa\u00e7\u00e3o completa
 emport.noMessages=Mensagem sem resultados. Nada a importar?
-emport.invalidImportData=Dado para importa\u00e7\u00e3o inv\u00e1lido: n\u00e3o \u00e9 um objeto JSON
+emport.invalidImportData=Dado para importa\u00e7\u00e3o inv\u00e1lido: n\u00e3o \u00e9 um objeto JSON. (www.json.org)
 emport.parseError=Erro de an\u00e1lise JSON: {0}
 emport.user.username=Um usu\u00e1rio n\u00e3o tem um valor ’nome de usu\u00e1rio’. Ignorado.
 emport.user.prefix=Usu\u00e1rio ''{0}'': {1}
@@ -1377,7 +1377,7 @@ login.validation.accountDisabled=Sua conta de usu\u00e1rio foi desativada. Por f
 login.loginButton=Login
 login.unknownBrowser=Checando a compatibilidade do browser...
 login.supportedBrowser=Este browser \u00e9 suportado.
-login.unsupportedBrowser=Seu browser pode funcionar com este produto, mas n\u00e3o \u00e9 oficialmente suportado pela Equipe Scada-LTS. Recomendamos o uso do <a href="http://www.mozilla.com/" target="_blank">Firefox</a> ou Chrome.
+login.unsupportedBrowser=Seu browser pode funcionar com este produto, mas n\u00e3o \u00e9 oficialmente suportado pela Equipe Scada-LTS. Recomendamos o uso do Mozilla Firefox, Google Chrome.
 login.nag=NOTA: voc\u00ea poder\u00e1 ter problemas com o ScadaLTS porque seu browser n\u00e3o \u00e9 oficialmente suportado. Por favor, atualize seu browser.  
 mailingLists.added=Lista de envio adicionada
 mailingLists.saved=Lista de envio salva
@@ -1479,7 +1479,7 @@ pointDetails.accessType=Tipo de acesso
 pointEdit.buttons.enable=Habilitar
 pointEdit.buttons.disable=Desabilitar
 pointEdit.buttons.restart=Reiniciar
-pointEdit.buttons.note=<span class="smallTitle">Nota:</span> salvar, desabilitar ou reiniciar um data point far\u00e1 com que todos os eventos ativos retornem ao normal.
+pointEdit.buttons.note=salvar, desabilitar ou reiniciar um data point far\u00e1 com que todos os eventos ativos retornem ao normal.
 
 pointEdit.chart.props=Propriedades do renderizador de gr\u00e1ficos
 pointEdit.chart.type=Tipo
@@ -1836,7 +1836,7 @@ scheduledEvents.validate.inactiveTrigger=Erro ao criar gatilho inativo: {0}
 scheduledEvents.validate.aliasTooLong=Alias n\u00e3o pode ser maior que 50 caracteres
 scheduledEvents.validate.invalidRtn=Inactive time must be after active time
 
-sql.warning=<span class="formError">Alerta:</span> use esta funcionalidade por risco pr\u00f3prio. Uso incorreto pode resultar em dados corrompidos e/ou falhas no sistema. 
+sql.warning=use esta funcionalidade por risco pr\u00f3prio. Uso incorreto pode resultar em dados corrompidos e/ou falhas no sistema. 
 sql.sql=SQL
 sql.query=Enviar consulta
 sql.update=Enviar atualiza\u00e7\u00e3o
@@ -2032,7 +2032,7 @@ viewEdit.compound.duration=Dura\u00e7\u00e3o
 
 views.title=Representa\u00e7\u00f5es Gr\u00e1ficas
 views.newView=Nova representa\u00e7\u00e3o
-views.noViews=Voc\u00ea n\u00e3o criou nenhuma representa\u00e7\u00e3o gr\u00e1fica. Crie uma <a href="view_edit.shtm">agora</a>.
+views.noViews=Voc\u00ea n\u00e3o criou nenhuma representa\u00e7\u00e3o gr\u00e1fica. Crie uma 
 
 watchlist.addToWatchlist=Adicionar na watch list
 watchlist.points=Points
@@ -2130,7 +2130,7 @@ event.system.process=Falha do processo do tratador de eventos
 
 event.audit.added=User "{0}" criado {1} com id {2}: {3}
 event.audit.changed=User "{0}" alerado {1} com id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty={0}: "{1}" to "{2}"
 event.audit.compoundEventDetector=Detector de evento composto
 event.audit.dataPoint=Data point
 event.audit.dataSource=Data source
@@ -2139,7 +2139,7 @@ event.audit.eventHandler=Tratador de evento
 event.audit.maintenanceEvent=Evento de manuten\u00e7\u00e3o
 event.audit.pointEventDetector=Detector de evento de data point
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2380,7 +2380,7 @@ event.ds.initialization=Exce\u00e7\u00e3o de inicializa\u00e7\u00e3o
 event.ds.message=Exce\u00e7\u00e3o de mensagem
 event.ds.device=Exce\u00e7\u00e3o de dispositivo
 event.ds.network=Exce\u00e7\u00e3o de rede
-event.ds.duplicateComm=Endere\u00e7o <b>comm</b> duplicado detectado
+event.ds.duplicateComm=Endere\u00e7o comm duplicado detectado
 event.ds.dataSource=Exce\u00e7\u00e3o de data source
 event.ds.pointRead=Exce\u00e7\u00e3o de leitura de data point
 event.ds.pointWrite=Exce\u00e7\u00e3o de escrita em data point
@@ -2695,8 +2695,8 @@ engUnit.188=Newtons por metro
 engUnit.189=watts por metro por Kelvin
 engUnit.190=kilometros
 
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.2=mA
 engUnit.abbr.3=A
 engUnit.abbr.4=ohms
@@ -2718,22 +2718,22 @@ engUnit.abbr.19=kWh
 engUnit.abbr.20=btus
 engUnit.abbr.21=therms
 engUnit.abbr.22=ton hours
-engUnit.abbr.23=J/Kg <inf>ar seco</inf>
-engUnit.abbr.24=btus/lb <inf>ar seco</inf>
+engUnit.abbr.23=J/Kg ar seco
+engUnit.abbr.24=btus/lb ar seco
 engUnit.abbr.25=ciclos por hora
 engUnit.abbr.26=ciclos por minuto
 engUnit.abbr.27=hertz
-engUnit.abbr.28=g <inf>H<inf>2</inf>O</inf> / kg <inf>ar seco</inf>
+engUnit.abbr.28=g H\u2082O / kg ar seco
 engUnit.abbr.29=%UR
 engUnit.abbr.30=mm
 engUnit.abbr.31=m
 engUnit.abbr.32=pol
 engUnit.abbr.33=p\u00e9s
-engUnit.abbr.34=W/p\u00e9<sup>2</sup>
-engUnit.abbr.35=W/m<sup>2</sup>
+engUnit.abbr.34=W/p\u00e9\u00b2
+engUnit.abbr.35=W/m\u00b2
 engUnit.abbr.36=lm
 engUnit.abbr.37=lx
-engUnit.abbr.38=lm/p\u00e9<sup>2</sup>
+engUnit.abbr.38=lm/p\u00e9\u00b2
 engUnit.abbr.39=kg
 engUnit.abbr.40=lb
 engUnit.abbr.41=t
@@ -2751,12 +2751,12 @@ engUnit.abbr.52=RT
 engUnit.abbr.53=Pa
 engUnit.abbr.54=kPa
 engUnit.abbr.55=bar
-engUnit.abbr.56=lbf/pol<sup>2</sup>
-engUnit.abbr.57=cm<inf>H<inf>2</inf>O</inf>
-engUnit.abbr.58=pol<inf>H<inf>2</inf>O</inf>
-engUnit.abbr.59=mm<inf>Hg</inf>
-engUnit.abbr.60=cm<inf>Hg</inf>
-engUnit.abbr.61=pol<inf>Hg</inf>
+engUnit.abbr.56=lbf/pol\u00b2
+engUnit.abbr.57=cmH\u2082O
+engUnit.abbr.58=polH\u2082O
+engUnit.abbr.59=mmHg
+engUnit.abbr.60=cmHg
+engUnit.abbr.61=polHg
 engUnit.abbr.62=&deg;C
 engUnit.abbr.63=K
 engUnit.abbr.64=&deg;F
@@ -2774,17 +2774,17 @@ engUnit.abbr.75=km/h
 engUnit.abbr.76=p\u00e9s/s
 engUnit.abbr.77=p\u00e9s/min
 engUnit.abbr.78=m/h
-engUnit.abbr.79=p\u00e9s<sup>3</sup>
-engUnit.abbr.80=m<sup>3</sup>
-engUnit.abbr.81=Ga<inf>UK</inf>
+engUnit.abbr.79=p\u00e9s\u00b3
+engUnit.abbr.80=m\u00b3
+engUnit.abbr.81=GaUK
 engUnit.abbr.82=l
-engUnit.abbr.83=Ga<inf>US</inf>
-engUnit.abbr.84=p\u00e9s<sup>3</sup>/min
-engUnit.abbr.85=m<sup>3</sup>/s
-engUnit.abbr.86=Ga<inf>UK</inf>/min
+engUnit.abbr.83=GaUS
+engUnit.abbr.84=p\u00e9s\u00b3/min
+engUnit.abbr.85=m\u00b3/s
+engUnit.abbr.86=GaUK/min
 engUnit.abbr.87=l/s
 engUnit.abbr.88=l/m
-engUnit.abbr.89=Ga<inf>US</inf>/min
+engUnit.abbr.89=GaUS/min
 engUnit.abbr.90=&deg;
 engUnit.abbr.91=&deg;C/h
 engUnit.abbr.92=&deg;F/min
@@ -2810,8 +2810,8 @@ engUnit.abbr.111=currency 7
 engUnit.abbr.112=currency 8
 engUnit.abbr.113=currency 9
 engUnit.abbr.114=currency 10
-engUnit.abbr.115=pol<sup>2</sup>
-engUnit.abbr.116=cm<sup>2</sup>
+engUnit.abbr.115=pol\u00b2
+engUnit.abbr.116=cm\u00b2
 engUnit.abbr.117=BTU/lb
 engUnit.abbr.118=cm
 engUnit.abbr.119=lb/s
@@ -2830,22 +2830,22 @@ engUnit.abbr.131=/h
 engUnit.abbr.132=mW
 engUnit.abbr.133=hPa
 engUnit.abbr.134=mbar
-engUnit.abbr.135=m<suop>3</sup>/h
+engUnit.abbr.135=m\u00b3/h
 engUnit.abbr.136=l/h
-engUnit.abbr.137=kWh/m<sup>2</sup>
-engUnit.abbr.138=kWh/p\u00e9<sup>2</sup>
-engUnit.abbr.139=MJ/m<sup>2</sup>
-engUnit.abbr.140=MJ/p\u00e9<sup>2</sup>
-engUnit.abbr.141=W/m<sup>2</sup>K
-engUnit.abbr.142=p\u00e9s<sup>3</sup>/s
+engUnit.abbr.137=kWh/m\u00b2
+engUnit.abbr.138=kWh/p\u00e9\u00b2
+engUnit.abbr.139=MJ/m\u00b2
+engUnit.abbr.140=MJ/p\u00e9\u00b2
+engUnit.abbr.141=W/m\u00b2K
+engUnit.abbr.142=p\u00e9s\u00b3/s
 engUnit.abbr.143=%obs/p\u00e9
 engUnit.abbr.144=%pbs/m
 engUnit.abbr.145=m&Omega;
 engUnit.abbr.146=MWh
 engUnit.abbr.147=kBTU
 engUnit.abbr.148=MBTU
-engUnit.abbr.149=kJ/kg<inf>ar seco</inf>
-engUnit.abbr.150=MJ/kg<inf>ar seco</inf>
+engUnit.abbr.149=kJ/kg ar seco
+engUnit.abbr.150=MJ/kg ar seco
 engUnit.abbr.151=kJ/K
 engUnit.abbr.152=MJ/K
 engUnit.abbr.153=N
@@ -2853,18 +2853,18 @@ engUnit.abbr.154=g/s
 engUnit.abbr.155=g/min
 engUnit.abbr.156=t/h
 engUnit.abbr.157=kBTU/h
-engUnit.abbr.158=s x 10<sup>2</sup>
+engUnit.abbr.158=s x 10\u00b2
 engUnit.abbr.159=ms
 engUnit.abbr.160=Nm
 engUnit.abbr.161=mm/s
 engUnit.abbr.162=mm/min
 engUnit.abbr.163=m/min
 engUnit.abbr.164=m/h
-engUnit.abbr.165=m<sup>3</sup>/min
-engUnit.abbr.166=m/s<sup>2</sup>
+engUnit.abbr.165=m\u00b3/min
+engUnit.abbr.166=m/s\u00b2
 engUnit.abbr.167=A/m
-engUnit.abbr.168=A/m<sup>2</sup>
-engUnit.abbr.169=Am<sup>2</sup>
+engUnit.abbr.168=A/m\u00b2
+engUnit.abbr.169=Am\u00b2
 engUnit.abbr.170=Fd
 engUnit.abbr.171=H
 engUnit.abbr.172=&Omega;m
@@ -2875,13 +2875,13 @@ engUnit.abbr.176=V/K
 engUnit.abbr.177=V/m
 engUnit.abbr.178=Wb
 engUnit.abbr.179=cd
-engUnit.abbr.180=cd/m<sup>2</sup>
+engUnit.abbr.180=cd/m\u00b2
 engUnit.abbr.181=K/h
 engUnit.abbr.182=K/min
 engUnit.abbr.183=Js
 engUnit.abbr.184=rad/s
-engUnit.abbr.185=m<sup>2</sup>/N
-engUnit.abbr.186=kg/m<sup>3</sup>
+engUnit.abbr.185=m\u00b2/N
+engUnit.abbr.186=kg/m\u00b3
 engUnit.abbr.187=Ns
 engUnit.abbr.188=N/m
 engUnit.abbr.189=W/mK
@@ -3478,22 +3478,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=Nota:
+sql.warning.prefix=Alerta:
+views.noViews.prefix=agora.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_ru.properties b/webapp-resources/messages_ru.properties
index d1676af0d6..5f4a32b4b2 100644
--- a/webapp-resources/messages_ru.properties
+++ b/webapp-resources/messages_ru.properties
@@ -666,7 +666,7 @@ dsEdit.meta.event.week=\u041d\u0430\u0447\u0430\u043b\u043e \u043d\u0435\u0434\u
 dsEdit.meta.event.month=\u041d\u0430\u0447\u0430\u043b\u043e \u043c\u0435\u0441\u044f\u0446\u0430
 dsEdit.meta.event.year=\u041d\u0430\u0447\u0430\u043b\u043e \u0433\u043e\u0434\u0430
 dsEdit.meta.event.cron=\u0428\u0430\u0431\u043b\u043e\u043d \u043a\u0440\u043e\u043d\u0430
-dsEdit.meta.delay=\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f <br/>
+dsEdit.meta.delay=\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f 
 dsEdit.meta.test.success=\u0423\u0441\u043f\u0435\u0448\u043d\u043e. \u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442={0}
 dsEdit.meta.test.successTs=\u0423\u0441\u043f\u0435\u0448\u043d\u043e. \u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442={0}, \u0432\u0440\u0435\u043c\u044f={1}
 dsEdit.meta.test.context=\u041e\u0434\u043d\u0430 \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u0442\u043e\u0447\u0435\u043a \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u044b \u0438\u043b\u0438 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0442
@@ -968,16 +968,16 @@ dsEdit.viconics.networkInfo=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u04
 dsEdit.viconics.refreshing=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435...
 dsEdit.viconics.rfModule=\u0420\u0430\u0434\u0438\u043e\u043c\u043e\u0434\u0443\u043b\u044c
 dsEdit.viconics.devices=\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430
-dsEdit.viconics.commAddress=\u0410\u0434\u0440\u0435\u0441  <br/> \u0441\u0432\u044f\u0437\u0438
-dsEdit.viconics.modelNumber=\u041d\u043e\u043c\u0435\u0440 <br/> \u043c\u043e\u0434\u0435\u043b\u0438
-dsEdit.viconics.firmwareRevision=\u0412\u0435\u0440\u0441\u0438\u044f <br/> \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b
+dsEdit.viconics.commAddress=\u0410\u0434\u0440\u0435\u0441    \u0441\u0432\u044f\u0437\u0438
+dsEdit.viconics.modelNumber=\u041d\u043e\u043c\u0435\u0440  \u043c\u043e\u0434\u0435\u043b\u0438
+dsEdit.viconics.firmwareRevision=\u0412\u0435\u0440\u0441\u0438\u044f  \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b
 dsEdit.viconics.zigbeeFirmwareRevision=\u0412\u0435\u0440\u0441\u0438\u044f \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b Zigbee 
-dsEdit.viconics.zigbeeFirmwareRevisionBr= \u0412\u0435\u0440\u0441\u0438\u044f <br/> \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b <br/> Zigbee
+dsEdit.viconics.zigbeeFirmwareRevisionBr= \u0412\u0435\u0440\u0441\u0438\u044f  \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b  Zigbee
 dsEdit.viconics.zigbeeNetworkAddress=\u0410\u0434\u0440\u0435\u0441 \u0441\u0435\u0442\u0438 Zigbee 
-dsEdit.viconics.zigbeeNetworkAddressBr= \u0410\u0434\u0440\u0435\u0441 <br/> \u0441\u0435\u0442\u0438 <br/> Zigbee
+dsEdit.viconics.zigbeeNetworkAddressBr= \u0410\u0434\u0440\u0435\u0441  \u0441\u0435\u0442\u0438  Zigbee
 dsEdit.viconics.ieee=IEEE
 dsEdit.viconics.chipRevision=\u0412\u0435\u0440\u0441\u0438\u044f \u043c\u0438\u043a\u0440\u043e\u0447\u0438\u043f\u0430
-dsEdit.viconics.chipRevisionBr=\u0412\u0435\u0440\u0441\u0438\u044f <br/> \u043c\u0438\u043a\u0440\u043e\u0447\u0438\u043f\u0430
+dsEdit.viconics.chipRevisionBr=\u0412\u0435\u0440\u0441\u0438\u044f  \u043c\u0438\u043a\u0440\u043e\u0447\u0438\u043f\u0430
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.unreliable=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0442\u043e\u0447\u043a\u0438 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043e\u0448\u0438\u0431\u043e\u0447\u043d\u044b\u043c
@@ -1120,7 +1120,7 @@ emport.importProgress=\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u04
 emport.importCancelled=\u0418\u043c\u043f\u043e\u0440\u0442 \u043e\u0442\u043c\u0435\u043d\u0435\u043d
 emport.importComplete=\u0418\u043c\u043f\u043e\u0440\u0442 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d
 emport.noMessages=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438. \u041d\u0435\u0442 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 \u0434\u043b\u044f \u0438\u043c\u043f\u043e\u0440\u0442\u0430?
-emport.invalidImportData=\u041d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0438\u043c\u043f\u043e\u0440\u0442\u0430: \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f  \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u043c JSON
+emport.invalidImportData=\u041d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0438\u043c\u043f\u043e\u0440\u0442\u0430: \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f  \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u043c JSON. (www.json.org)
 emport.parseError=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438 JSON : {0}
 emport.user.username=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044e \u043d\u0435 \u043f\u0440\u0438\u0441\u0432\u043e\u0435\u043d\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 '\u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f'. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.
 emport.user.prefix=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c ''{0}'': {1}
@@ -1294,7 +1294,7 @@ login.validation.accountDisabled=\u0412\u0430\u0448 \u0430\u043a\u043a\u0430\u04
 login.loginButton=\u041b\u043e\u0433\u0438\u043d
 login.unknownBrowser=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u043e\u0441\u0442\u0438 \u0412\u0430\u0448\u0435\u0433\u043e \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0430...
 login.supportedBrowser=\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.
-login.unsupportedBrowser=\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043c\u043e\u0436\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u0441 \u044d\u0442\u0438\u043c \u043f\u0440\u043e\u0434\u0443\u043a\u0442\u043e\u043c, \u043d\u043e \u043e\u0444\u0438\u0446\u0438\u0430\u043b\u044c\u043d\u043e \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u044b\u043c \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435\u043c Scada-LTS.  \u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u043c\u0435\u0441\u0442\u043e \u043d\u0435\u0433\u043e <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, \u0438\u043b\u0438 Internet Explorer 7.
+login.unsupportedBrowser=\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043c\u043e\u0436\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u0441 \u044d\u0442\u0438\u043c \u043f\u0440\u043e\u0434\u0443\u043a\u0442\u043e\u043c, \u043d\u043e \u043e\u0444\u0438\u0446\u0438\u0430\u043b\u044c\u043d\u043e \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u044b\u043c \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435\u043c Scada-LTS.  \u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u043c\u0435\u0441\u0442\u043e \u043d\u0435\u0433\u043e Mozilla Firefox, Google Chrome.
 login.nag=\u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435: \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u044b \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u0441\u043e ScadaLTS, \u0442\u0430\u043a \u043a\u0430\u043a \u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043e\u0444\u0438\u0446\u0438\u0430\u043b\u044c\u043d\u043e \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u0435 \u0431\u0440\u0430\u0443\u0437\u0435\u0440. 
 
 mailingLists.added=\u0421\u043f\u0438\u0441\u043e\u043a \u0440\u0430\u0441\u0441\u044b\u043b\u043a\u0438 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d
@@ -1398,7 +1398,7 @@ pointDetails.accessType=\u0422\u0438\u043f \u0434\u043e\u0441\u0442\u0443\u043f\
 pointEdit.buttons.enable=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c
 pointEdit.buttons.disable=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c
 pointEdit.buttons.restart=\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c
-pointEdit.buttons.note=<span class="smallTitle">\u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435:</span> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435, \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u0432\u043e\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u0442 \u0432\u0441\u0435 \u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0441\u043e\u0431\u044b\u0442\u0438\u044f \u0432 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435
+pointEdit.buttons.note=\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435, \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u0432\u043e\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u0442 \u0432\u0441\u0435 \u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0441\u043e\u0431\u044b\u0442\u0438\u044f \u0432 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435
 
 pointEdit.chart.props=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u0435\u043b\u044f \u0433\u0440\u0430\u0444\u0438\u043a\u043e\u0432 
 pointEdit.chart.type=\u0422\u0438\u043f
@@ -1752,7 +1752,7 @@ scheduledEvents.validate.inactiveTrigger=\u041e\u0448\u0438\u0431\u043a\u0430 \u
 scheduledEvents.validate.aliasTooLong=\u0414\u043b\u0438\u043d\u0430 \u043f\u0441\u0435\u0432\u0434\u043e\u043d\u0438\u043c\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0431\u043e\u043b\u0435\u0435 50 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432
 scheduledEvents.validate.invalidRtn=\u0412\u0440\u0435\u043c\u044f \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u043f\u043e\u0437\u0436\u0435 \u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f 
 
-sql.warning=<span class="formError">\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435:</span> \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u0443 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043d\u0430 \u0432\u0430\u0448 \u0441\u0442\u0440\u0430\u0445 \u0438 \u0440\u0438\u0441\u043a. \u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u043a \u043f\u043e\u0442\u0435\u0440\u0435 \u0434\u0430\u043d\u043d\u044b\u0445 \u0438/\u0438\u043b\u0438 \u0441\u0431\u043e\u044f\u043c \u0432 \u0440\u0430\u0431\u043e\u0442\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u044b. 
+sql.warning= \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u0443 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043d\u0430 \u0432\u0430\u0448 \u0441\u0442\u0440\u0430\u0445 \u0438 \u0440\u0438\u0441\u043a. \u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u043a \u043f\u043e\u0442\u0435\u0440\u0435 \u0434\u0430\u043d\u043d\u044b\u0445 \u0438/\u0438\u043b\u0438 \u0441\u0431\u043e\u044f\u043c \u0432 \u0440\u0430\u0431\u043e\u0442\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u044b. 
 sql.sql=SQL
 sql.query=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0437\u0430\u043f\u0440\u043e\u0441
 sql.update=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435
@@ -1930,7 +1930,7 @@ viewEdit.compound.duration=\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u044
 
 views.title=\u0413\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0432\u0438\u0434\u044b
 views.newView=\u041d\u043e\u0432\u044b\u0439 \u0432\u0438\u0434
-views.noViews=\u0412\u044b \u043d\u0435 \u0441\u043e\u0437\u0434\u0430\u043b\u0438 \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u0432\u0438\u0434\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 <a href="view_edit.shtm">\u0441\u0435\u0439\u0447\u0430\u0441</a>.
+views.noViews=\u0412\u044b \u043d\u0435 \u0441\u043e\u0437\u0434\u0430\u043b\u0438 \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u0432\u0438\u0434\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 
 
 watchlist.addToWatchlist=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u043b\u0438\u0441\u0442 \u043d\u0430\u0431\u043b\u044e\u0434\u0435\u043d\u0438\u044f
 watchlist.points=\u0422\u043e\u0447\u043a\u0438
@@ -2030,7 +2030,7 @@ event.system.process=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0431\u0440\u04
 
 event.audit.added=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c "{0}" \u0441\u043e\u0437\u0434\u0430\u043b {1} \u0441 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u043c {2}: {3}
 event.audit.changed=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c "{0}" \u0438\u0437\u043c\u0435\u043d\u0438\u043b {1} \u0441 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u043c {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" \u0432 "{2}"
+event.audit.changedProperty={0}: "{1}" \u0432 "{2}"
 event.audit.compoundEventDetector=\u0421\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0439 \u0434\u0435\u0442\u0435\u043a\u0442\u043e\u0440 \u0441\u043e\u0431\u044b\u0442\u0438\u0439
 event.audit.dataPoint=\u0422\u043e\u0447\u043a\u0430 \u0434\u0430\u043d\u043d\u044b\u0445
 event.audit.dataSource=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0434\u0430\u043d\u043d\u044b\u0445
@@ -2039,7 +2039,7 @@ event.audit.eventHandler=\u041e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\
 event.audit.maintenanceEvent=\u0421\u043e\u0431\u044b\u0442\u0438\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f
 event.audit.pointEventDetector=\u0414\u0435\u0442\u0435\u043a\u0442\u043e\u0440 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u043e\u0431\u044a\u0435\u043a\u0442\u0430
 event.audit.pointLink=\u0421\u0432\u044f\u0437\u044c \u0442\u043e\u0447\u0435\u043a
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2600,8 +2600,8 @@ engUnit.188=\u041d\u044c\u044e\u0442\u043e\u043d \u043d\u0430 \u043c\u0435\u0442
 engUnit.189=\u0412\u0430\u0442\u0442\u044b \u043d\u0430 \u043c\u0435\u0442\u0440-\u043a\u0435\u043b\u044c\u0432\u0438\u043d
 engUnit.190=kilometers
 
-engUnit.abbr.0=\u043c<sup>2</sup>
-engUnit.abbr.1=\u0444<sup>2</sup>
+engUnit.abbr.0=\u043c\u00b2
+engUnit.abbr.1=\u0444\u00b2
 engUnit.abbr.2=\u043c\u0410
 engUnit.abbr.3=\u0410
 engUnit.abbr.4=\u041e\u043c
@@ -3474,22 +3474,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
 annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=\u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435:
+sql.warning.prefix=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435:
+views.noViews.prefix=\u0441\u0435\u0439\u0447\u0430\u0441.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom Css has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_zh.properties b/webapp-resources/messages_zh.properties
index 0ca322fc93..41cb6d55b5 100644
--- a/webapp-resources/messages_zh.properties
+++ b/webapp-resources/messages_zh.properties
@@ -581,7 +581,7 @@ dsEdit.meta.event.week=\u5f00\u59cb\u7684\u5468\u6570
 dsEdit.meta.event.month=\u5f00\u59cb\u6708\u4efd
 dsEdit.meta.event.year=\u5f00\u59cb\u5e74\u4efd
 dsEdit.meta.event.cron=\u5b9a\u65f6\u5668\u8868\u8fbe\u5f0f
-dsEdit.meta.delay=\u6267\u884c\u5ef6\u65f6<br/>
+dsEdit.meta.delay=\u6267\u884c\u5ef6\u65f6 
 dsEdit.meta.test.success=\u6210\u529f\u3002\u7ed3\u679c={0}
 dsEdit.meta.test.successTs=\u6210\u529f\u3002\u7ed3\u679c={0}\uff0c\u65f6\u95f4\u6233={1}
 dsEdit.meta.test.context=\u4e00\u4e2a\u6216\u8005\u591a\u4e2a\u70b9\u5df2\u5931\u6548\u6216\u8005\u4e0d\u5b58\u5728
@@ -899,7 +899,7 @@ emport.importProgress=\u6b63\u5728\u5bfc\u5165...
 emport.importCancelled=\u5bfc\u5165\u5df2\u53d6\u6d88
 emport.importComplete=\u5bfc\u5165\u5b8c\u6210
 emport.noMessages=\u65e0\u8fd4\u56de\u4fe1\u606f\u3002\u65e0\u9700\u5bfc\u5165?
-emport.invalidImportData=\u5bfc\u5165\u6570\u636e\u65e0\u6548: \u975eJSON\u5bf9\u8c61
+emport.invalidImportData=\u5bfc\u5165\u6570\u636e\u65e0\u6548: \u975eJSON\u5bf9\u8c61. (www.json.org)
 emport.parseError=JSON\u5bf9\u8c61\u5206\u6790\u9519\u8bef: {0}
 emport.user.username=\u7528\u6237\u7f3a\u5c11'\u7528\u6237\u540d'\u3002\u5df2\u5ffd\u7565\u3002
 emport.user.prefix=\u7528\u6237 ''{0}'': {1}
@@ -1029,8 +1029,7 @@ login.loginButton=\u767b\u5f55
 login.unknownBrowser=\u8bf7\u68c0\u67e5\u60a8\u6d4f\u89c8\u5668\u7684\u517c\u5bb9\u6027...
 login.supportedBrowser=\u672c\u6d4f\u89c8\u5668\u662f\u5b98\u65b9\u652f\u6301\u7684\u3002
 login.unsupportedBrowser=\u60a8\u7684\u6d4f\u89c8\u5668\u53ef\u80fd\u53ef\u4ee5\u6d4f\u89c8\u672c\u7ad9\uff0c\u4f46\u5b83\u4e0d\u662fserosoft\u8f6f\u4ef6\u516c\u53f8\u5b98\u65b9\u652f\u6301\u7684\u6d4f\u89c8\u5668 \u3002\
-\u6211\u4eec\u63a8\u8350\u60a8\u4f7f\u7528 <a href="http://www.mozilla.com/" target="_blank">\u706b\u72d0(Firefox)</a>, Chrome, \u6216\u8005 \
-\u5fae\u8f6f\u7684Internet Explorer 7.
+\u6211\u4eec\u63a8\u8350\u60a8\u4f7f\u7528 Mozilla Firefox, Google Chrome.
 login.nag=\u6ce8\u610f: \u7531\u4e8e\u60a8\u4f7f\u7528\u7684\u6d4f\u89c8\u5668\u4e0d\u5728\u5b98\u65b9\u652f\u6301\u7684\u8303\u56f4\u5185\uff0c\u6240\u4ee5\u8bbf\u95ee\u672c\u7ad9\u53ef\u80fd\u9047\u5230\u4e00\u4e9b\u95ee\u9898\u3002\u8bf7\u5347\u7ea7\u6216\u8005\u66f4\u6362\u6d4f\u89c8\u5668\u3002  
 
 mailingLists.added=\u90ae\u4ef6\u5217\u8868\u5df2\u589e\u52a0
@@ -1098,7 +1097,7 @@ pointDetails.accessType=\u8bbf\u95ee\u7c7b\u578b
 pointEdit.buttons.enable=\u6fc0\u6d3b
 pointEdit.buttons.disable=\u7981\u7528
 pointEdit.buttons.restart=\u91cd\u542f
-pointEdit.buttons.note=<span class="smallTitle">\u6ce8\u610f:</span> \u4fdd\u5b58\u3001\u7981\u7528\u3001\u91cd\u542f\u70b9\u5c06\u4f7f\u5176\u544a\u8b66\u4e8b\u4ef6\u7ea7\u522b\u53d8\u4e3a\u666e\u901a
+pointEdit.buttons.note=\u4fdd\u5b58\u3001\u7981\u7528\u3001\u91cd\u542f\u70b9\u5c06\u4f7f\u5176\u544a\u8b66\u4e8b\u4ef6\u7ea7\u522b\u53d8\u4e3a\u666e\u901a
 
 pointEdit.chart.props=\u56fe\u8868\u6e32\u67d3\u5668\u5c5e\u6027
 pointEdit.chart.type=\u7c7b\u578b
@@ -1412,7 +1411,7 @@ scheduledEvents.validate.activeTrigger=\u521b\u5efaactive\u89e6\u53d1\u5668\u65f
 scheduledEvents.validate.inactiveTrigger=\u521b\u5efainactive\u89e6\u53d1\u5668\u65f6\u53d1\u751f\u9519\u8bef\uff1a{0}
 scheduledEvents.validate.aliasTooLong=\u522b\u540d\u4e0d\u80fd\u8d85\u8fc750\u5b57\u7b26
 
-sql.warning=<span class="formError">\u8b66\u544a\uff1a</span> \u4f7f\u7528\u672c\u5de5\u5177\u98ce\u9669\u81ea\u62c5\u3002\u4f7f\u7528\u65b9\u6cd5\u4e0d\u5f97\u5f53\u5c06\u53ef\u80fd\u5bfc\u81f4\u635f\u574f\u7684\u6570\u636e\u6216\u8005\u7cfb\u7edf\u7ea7\u522b\u7684\u9519\u8bef\u3002(\u539f\u56e0\u662fSQL\u76f4\u63a5\u4f5c\u7528\u4e8e\u6570\u636e\u5e93) 
+sql.warning= \u4f7f\u7528\u672c\u5de5\u5177\u98ce\u9669\u81ea\u62c5\u3002\u4f7f\u7528\u65b9\u6cd5\u4e0d\u5f97\u5f53\u5c06\u53ef\u80fd\u5bfc\u81f4\u635f\u574f\u7684\u6570\u636e\u6216\u8005\u7cfb\u7edf\u7ea7\u522b\u7684\u9519\u8bef\u3002(\u539f\u56e0\u662fSQL\u76f4\u63a5\u4f5c\u7528\u4e8e\u6570\u636e\u5e93) 
 sql.sql=SQL
 sql.query=\u63d0\u4ea4\u67e5\u8be2
 sql.update=\u63d0\u4ea4\u66f4\u65b0
@@ -1579,7 +1578,7 @@ viewEdit.compound.duration=\u671f\u95f4
 
 views.title=\u56fe\u5f62\u5316\u89c6\u56fe
 views.newView=\u65b0\u5efa\u89c6\u56fe
-views.noViews=\u672a\u521b\u5efa\u56fe\u5f62\u5316\u89c6\u56fe. <a href="view_edit.shtm">\u9a6c\u4e0a\u521b\u5efa</a>.
+views.noViews=\u672a\u521b\u5efa\u56fe\u5f62\u5316\u89c6\u56fe. 
 
 viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
@@ -1678,7 +1677,7 @@ event.system.pointLink=\u70b9\u7684\u94fe\u63a5\u5931\u8d25
 
 event.audit.added=\u7528\u6237 "{0}" \u5df2\u88ab\u521b\u5efa {1} \u83b7\u5f97\u6807\u8bc6\u4e3a {2}: {3}
 event.audit.changed=\u7528\u6237 "{0}" \u5df2\u88ab\u66f4\u6539 {1} \u5176\u6807\u8bc6\u4e3a {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" -> "{2}"
+event.audit.changedProperty={0}: "{1}" -> "{2}"
 event.audit.compoundEventDetector=\u7ec4\u5408\u4e8b\u4ef6\u4fa6\u5bdf\u5668
 event.audit.dataPoint=\u6570\u636e\u70b9
 event.audit.dataSource=\u6570\u636e\u6e90
@@ -1687,7 +1686,7 @@ event.audit.eventHandler=\u4e8b\u4ef6\u5904\u7406\u5668
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=\u70b9\u4e8b\u4ef6\u4fa6\u5bdf\u5668
 event.audit.pointLink=\u70b9\u7684\u94fe\u63a5
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2450,7 +2449,7 @@ publisherEdit.persistent.status.connectionState=Connection\: {0}
 emport.maintenanceEvent.prefix=Maintenance event ''{0}''\: {1}
 dox.internalDS=Internal Data Source
 systemSettings.instanceId=Instance ID
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 eventHandlers.activeScript=When active script
 dsEdit.mbus.addressHex=Address
 dsEdit.mbus.manufacturer=Manufacturer
@@ -2488,9 +2487,9 @@ engUnit.abbr.5=V
 engUnit.abbr.4=ohms
 engUnit.abbr.3=A
 engUnit.abbr.2=mA
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.1=ft\u00b2
 graphic.enhancedImageChart.pointConfig.showPoints=Display points of measure\:
-engUnit.abbr.0=m<sup>2</sup>
+engUnit.abbr.0=m\u00b2
 scripts.objectsContext=Context objects
 dsEdit.radiuino.radiuinoDataType.2bUnsigned=Integer (unsigned 2 bytes)
 dsEdit.iec101Ethernet=IEC101 Ethernet
@@ -2604,7 +2603,7 @@ publisherEdit.persistent.startSync=Synchronize history
 dsEdit.radiuino.desc=Radiuino Properties
 graphic.button=ON/OFF Button
 dsEdit.openv4j.device=Device
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
+dsEdit.viconics.chipRevisionBr=Chip revision
 dox.importProject=Importing projects
 events.search.maxResults=Max results
 dox.pachubeDS=Pachube data source
@@ -2664,7 +2663,7 @@ publisherEdit.pachube.retries=Retries
 maintenanceEvents.schedule.manual={0} - Manual
 dsEdit.persistent.dsconn=Port\: {0}
 emport.error.eventType.missing.reference=Event type must have a ''{0}''
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 pointEdit.props.deviceName=Device Name
 dsEdit.alpha2.station=Station
 dsEdit.dnp3.minIndex=Min index
@@ -3076,7 +3075,7 @@ emport.publisher.invalidType=Publisher with XID ''{0}'' does not already exist a
 dsEdit.pachube.timeout=Timeout (seconds)
 common.confirmDelete=Are you sure you want delete?
 dsEdit.modbus.maxReadBitCount=Max read bit count
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 scripts.seDetails=Script details
 dsedit.opc.tagName=Tag Tag
 dsEdit.modbus.modbusDataType.varchar=Variable length string
@@ -3232,7 +3231,7 @@ dox.scriptDPObject=Data Point Context Object
 dox.opcDS=Data Source OPC
 dsEdit.modbus.locatorTestIp.startError=There was a problem testing the locator. ({0})
 publisherEdit.persistent=Serotonin Persistent TCP
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.commAddress=Comm address
 dsEdit.openv4j.dataPoint=Datapoint
 dsEdit.mbus.addPoint=add
 validate.between=Must be between {0} and {1}
@@ -3409,7 +3408,7 @@ dsEdit.asciiFile.checkFile=Check
 event.persistent.xidTooLong=XID of "{0}" point is too long.
 event.viconics.duplicateCommException=Duplicate comm address detected\: {0}
 dsEdit.drStorageHt5b.type.Temperature=Temperature
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.dnp3.binaryInput=Binary Input
 dsEdit.jmx.getObjectNames=Get object names
 dox.colours=Color
@@ -3427,22 +3426,50 @@ user.view.hideShortcutDisableFullScreen=Hide shortcut to disable full screen
 user.view.forceAdminTitle=The function is enforced by the Admin
 validate.1to255=Must be between 1 and 255 inclusive
 systemsettings.event.pendingLimit=Event Pending Limit
-systemsettings.event.pendingCacheEnabled=Enabled Event Pending Cache
-annotation.unknown=Unknow
+systemsettings.event.pendingCacheEnabled=Event Pending Cache Enabled
+annotation.unknown=Unknown
 event.auto.acknowledge=Automatic acknowledge
-systemsettings.workitems.reporting.enabled=Work items reporting enabled
-systemsettings.workitems.reporting.itemspersecond.enabled=Items per second reporting enabled
-systemsettings.workitems.reporting.itemspersecond.limit=Items per second reporting limit
-systemsettings.threads.name.additional.length=Thread name length
+systemsettings.workitems.reporting.enabled=Work Items Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.enabled=Items Per Second Reporting Enabled
+systemsettings.workitems.reporting.itemspersecond.limit=Items Per Second Reporting Limit
+systemsettings.threads.name.additional.length=Thread Name Length
 common.addPoint=Add point
-systemsettings.webresource.uploads.path=Uploads images path
-systemsettings.webresource.graphics.path=Graphics images path
+systemsettings.webresource.uploads.path=Uploads Images Path
+systemsettings.webresource.graphics.path=Graphics Images Path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+event.ds.monitorWrite=Monitor write exception
+dsEdit.mbus.correctionFactor=Correction factor
 annotation.api=REST API
+pointEdit.buttons.note.prefix=\u6ce8\u610f:
+sql.warning.prefix=\u8b66\u544a\uff1a:
+views.noViews.prefix=\u9a6c\u4e0a\u521b\u5efa.
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?
 event.sms.failure=Failed to send sms titled "{0}" to "{1}". Message: "{2}"
 event.script.failure=Failed execute script: "{0}", Message: "{1}"
 event.system.sms=Sms send failure
-event.system.script=Script event handler failure
\ No newline at end of file
+event.system.script=Script event handler failure
+validate.valueRestored=Previous value restored
+validate.invalidVariable=Invalid variable: {0}
+events.assigneeByUser=- {0}
+events.assign=Assign
+events.unassign=Unassign
+events.unassignedBy=Unassigned {0} by {1} for {2}
+events.assignedBy=Assigned by {0} for {1}
+common.assignee=Assignee
+event.system.assigned=Assigned Event
+event.system.unassigned=Unassigned Event
+event.assign.enabled=Event Assign enabled
+viewEdit.graphic.hideAssigneeColumn=Hide Assignee column
+systemsettings.top.description.prefix = Top description prefix
+systemsettings.top.description = Top description
+header.imageSets=Image sets
+header.dynamicImages=Dynamic images
+systemSettings.customCssSaved=Custom CSS has been saved
+systemSettings.invalidCustomCss=Invalid custom CSS
+systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
+event.ds.recursiveError=Recursive Error
+event.meta.recursiveError=Recursive error in point "{0}": {1}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive