fixed db conf issue
Merge branch 'master' of ssh://gh/juhovuori/catconf