Initial commit from jim branch
Merge branch 'master' into dev/jim
Changed db info back to remote server