update doc and sql
update controltools
update
Merge remote-tracking branch 'upstream/master'