Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/macro.ftl

@@ -0,0 +1,7 @@
+<#macro ms_file jsonString>
+    <#if jsonString??&&jsonString!=''>
+        <@compress>
+            ${jsonString?eval[0].path}
+        </@compress>
+    </#if>
+</#macro>