Fix bug in prop->cnf
Merge commit '2d2ec55f71ac7c2b664c5694d7e5d293881bccde' into dev
Fix bugs in logic.lisp
Merge commit '752052e689022a3e6065a6b1a2abba76014a5996' into dev