removed unnecessary cplex macro
added wrapper for MPLP
added missing patch for MPLP
Merge pull request #38 from stopfer/master

removed unnecessary cplex macro