Inputs/Calculations panel merge
Inputs/Calculations panel merge
Fixed edges not appearing when Demo used in Calculations
Plan panel changed to parameter/accumulator/function
update plan panel text
Merge branch 'master' into joinerr