Merge remote-tracking branch 'origin/dev' into dev

rs-universal/rs-universal-server/pom.xml

@@ -95,6 +95,12 @@
             <version>0.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <optional>true</optional>
+            <version>2.8.3</version>
+        </dependency>
     </dependencies>
 
     <build>