Merge pull request #495 from cutedemons/master

	resolve conflict
Merge pull request #496 from cutedemons/master

resultset proxy
Merge pull request #497 from cutedemons/master

resultset metadata proxy
Merge pull request #498 from cutedemons/master

fix bug
Update lang.js

“指定建立连接是使用的用户名” ==》 “指定建立连接时使用的用户名”
Merge pull request #500 from crazier9527/patch-1

Update lang.js
Merge pull request #503 from cutedemons/master

improve sqlwall