Merge branch 'BT18' into BT18_Green

Assets/CardBaseEntity/CardEntity_JSONLoader.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb45d59c26c33cb45e206f96440c4df0c1d399279c1b0120f4860054c77d5b64
-size 238
+oid sha256:e5f55c18bc7682be2164f6bfb3ed780ebcda7343c620e832e64ab4e2cc46ae9c
+size 477