updating UI
remove dependency on glpk module
Merge branch 'master' into dev