gui rework and add InfMJSrc
Merge branch 'master' into 1.5.2
downgrade previous commit to 1.5.2