Merge branch 'master', remote-tracking branch 'origin/master'
database connected;change to mysql2
add sdk user