AXModal

AXModal v1.38 'add Config' scrollLock
Merge remote-tracking branch 'origin/dev' into dev