- moved generateCli to candidateGenerator.h from solver.h, updated generate.cpp and removed includes in solver.h
- cleaned up solver.h further
- fixed planePrimitive compilation problem in 3d merging.