feat #682 add 'macro' to @aria:Dialog as an alias to 'contentMacro'

To make API more consistent, let `macro` in @aria:Dialog be a synonym for
`contentMacro`. `contentMacro` still takes precedence.

Close #682. Close #687.