added variable CPLEX_ROOT_DIR
Merge origin/master