Merge remote-tracking branch 'origin/master' into Mainliner
added update sql statments
database
Merge remote-tracking branch 'origin/Mainliner'