jdbc template
made merge changes before pull
jdbc commit
sync with master
tried to configure jpa, failed due to wrong oracle installation