Merge remote-tracking branch 'origin/master'

# Conflicts:
#	web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

web/runeconomy-xk/src/main/resources/application-jn.yml

@@ -96,9 +96,9 @@ logging:
     com.example: debug
 initialcode: INITIAL
 db:
-  URL1: http://127.0.0.1:8011/ts
+  URL1: http://10.81.3.162:8011/ts
 #  URL1: http://10.81.3.160:8011/ts
-  URL2: http://10.81.3.160:8012/ts
+  URL2: http://10.81.3.162:8012/ts
 
 #
 #db: