removes CNF.solver.scala
CNF.scala solves too!
adds label.Variable id_map
Merge branch 'master' of https://github.com/adressel/prog_synth_xpath