Merge remote-tracking branch 'origin/master'

cx-equipment/cx-equipment-server/src/main/resources/bootstrap.yml

@@ -2,11 +2,11 @@ spring:
   profiles:
     active: dev
   application:
-    name: cx-equipment-server
+    name: rw-equipment
   jta:
     atomikos:
       properties:
-        log-base-name: cx-equipment-log
+        log-base-name: rw-equipment-log
   servlet:
     multipart:
       max-file-size: 100MB