Merge branch 'april'
jdbc test not completed
jdbc test
DB connection done