refs #30969
Merge branch 'features/modalDialog-style' of
https://github.com/aipocom/aipo.git into features/modalDialog-style

Conflicts:
	war/src/main/webapp/javascript/aimluck/widget/Dialog.js
	war/src/main/webapp/javascript/aimluck/widget/Dialog.xd.js