add form import type and 3eme version of sql
Merge remote-tracking branch 'origin/master'