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

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 .gitignore

@@ -10,7 +10,7 @@
# should NOT be excluded as they contain compiler settings and other important
# information for Eclipse / Flash Builder.
/.idea/
/screen-api/target/

/screen-common/target/
/screen-manage/target/
/.idea/