Merge pull request #37 from chiaS/master

solved db and pitchfork conflicts
Merge branch 'master' of https://github.com/chiaS/COBALT-CLERIC