Add Sql handling support and JAX-RS
Merge remote-tracking branch 'origin/master'