Merge branch 'master' into dev
Fixed mljsme script for new tar gz layout
deleted vanprod3 file
Merge branch 'dev'