Goo
Merge branch 'origin/develop'

Conflicts:
	library/mysqldriver.js
	library/sqldriver.js