Merge branch 'master' into server

script @ 94dab4b2

-Subproject commit 042183249e71f460e59ff9f21ca8a310d7cea489
+Subproject commit 94dab4b22bed55238d5f0724a809edd04fbedba9

srvpro.conf

+#srvpro config file
+#server_name server_ip server_port
+
+!YGOPro Koishi Server
+119.23.146.219
+7210
+
+!YGOPro 222DIY Server
+119.23.146.219
+222
+
+!YGOPro THC Server
+119.23.146.219
+666
+
+!YGOPro Koishi TCG Server
+119.23.146.219
+1311
+
+!YGOPro 233 Server
+118.178.111.167
+233
+
+!YGOPro 23333 Server
+118.178.111.167
+23333
+
+!YGOPro Tournament Server #1
+119.23.146.219
+1262
+
+!YGOPro Tournament Server #2
+119.23.146.219
+986
+
+!YGOPro Tournament Server #3
+119.23.146.219
+357
+
+!YGOPro Nanahira Server
+213.159.202.230
+7210
+
+!YGOPro 222DIY Backup Server
+213.159.202.230
+2220
+
+!YGOPro 2Pick Server
+2pick.mycard.moe
+765
+
+!YGOPro League Server
+120.24.169.252
+233