BUG 2411: removed extra condition
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
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
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
Removed math-parser

Removed math-parser from git.ignore so that it can be updated from the repo since it is no longer in the build file
Merge branch 'dillanButler' of https://github.com/bvds/LaitsV3 into dillanButler
fix for bug 2448, changed the second message for the lastFailure2
merging master into pradeep
log error fixed for wrong value of out of focus time and session running info
error for time corrected for calculating end of session
copyright added to the code
master merged to sachin