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

# Conflicts:
#	src/main/java/com/ai/da/service/AccountService.java

src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java

@@ -15,6 +15,8 @@ public class UserDesignStatisticDTO {
 
     private String isTrial;
 
+    private String credits;
+
     private String trialOrderId;
 
     private String title;