Bug fixes
Merge branch 'rptiwari' of https://github.com/rptiwari/LaitsV3.git into joinerr
Merge branch 'joinerr' of https://github.com/rptiwari/LaitsV3.git into joinerr
Fixed bugs discovered this morning in Calc panel