Merge remote-tracking branch 'origin/master'

pom.xml

@@ -42,7 +42,7 @@
         <xstream.version>1.4.7</xstream.version>
         <guava.version>17.0</guava.version>
         <dozer.version>5.5.1</dozer.version>
-        <poi.version>3.9</poi.version>
+        <poi.version>3.16</poi.version>
         <freemarker.version>2.3.20</freemarker.version>
         <ckfinder.version>2.3</ckfinder.version>
         <websocket.version>1.3.0</websocket.version>
@@ -530,6 +530,12 @@
             <version>${poi.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6</version>
+        </dependency>
+
         <!-- image util -->
         <dependency>
             <groupId>com.drewnoakes</groupId>