NumberBox numberFormat is settable
Merge branch '1.2_ADViewer'
Merge remote-tracking branch 'origin/master' into 1.3