problem name conflict check
[Stable] Save As- Problem name conflict verification
Merge branch 'master' into vallabh
BUG 2411: removed extra condition
Merge branch 'master' into vallabh
Merge remote-tracking branch 'origin/master' into avaneesh
removing object copy, using dojo.clone
added preview button
added show in student model fields to node editor
adding click hanlder to preview
Populating combo boxes on public login html
Merge branch 'master' into vallabh
Auto populating combo boxes on public login html - Code clean up
Added JSON files for energy balance problems
Energy balance 1.json modified
modified node editor to add nodes to student model
Merge branch 'master' into vallabh
Merge branch 'avaneesh' into pradeep
Removed math-parser

Removed the math-parser update so that it can be pulled instead from our own parser and so that it is editable
logic for pulse function

added pulse function to parser.js as well as information in the other
js files to allow it to be integrated