Merge branch 'dev' back to master (bugfix and better CNF)
better printing of FO substitutions
Better printing of substitutions