Initial commit
Merge commit '5888a0191' into github_master

Compile against GLPK 4.52 on Ubuntu 14.04
Merge branch 'github_master' into dev