update sql scripts
Merge remote-tracking branch 'origin/DEMO2' into DEMO2