local connection commented out, server connectiona ctivated
resolved merge conflicts
Merge branch 'master' of https://github.com/sazlin/rheTOracle