BUG 2411: removed extra condition
Merge remote-tracking branch 'origin/master' into avaneesh
added show in student model fields to node editor
Added JSON files for energy balance problems
Energy balance 1.json modified
modified node editor to add nodes to student model
Merge branch 'avaneesh' into pradeep