Jdbc driver

merged master into jdbc-driver