replace glpk-maxsat with glpsol-maxsat in README
Merge branch 'master' into maxsat2013