added objects fol2hol and recreateWithFactory which allow a recreation of terms with the HOLFactory or an arbitrary factory respectvely (the plan is to fix errors in ceres, where we mix a fol refutation with a hol proof, which is generally the case - all our input formats creat hol formulas, but we also heve real hol proofs). also added changeTypeIn to be able to reverse applications of reduceHolToFOL and type change from exportTPTP.

git-svn-id: http://gapt.googlecode.com/svn/trunk/source@1902 85d21ef8-add0-11de-ae77-5bfb9c5a3f34
fixed a compile failure in cli

git-svn-id: http://gapt.googlecode.com/svn/trunk/source@1903 85d21ef8-add0-11de-ae77-5bfb9c5a3f34
Fix m2e integration