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

rs-website/rs-website-server/pom.xml

@@ -32,7 +32,12 @@
             <version>2.0-rscp-SNAPSHOT</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>