- major code cleaning
- integrating CProver preferences in UI
Merge remote-tracking branch 'origin/master'