bug 2515
merging student model nodes
merge student model nodes,handling descriptionIDs for student nodes, modified updateXYPostion for merging student nodes
Merge branch 'merging'
Adds Pradeep's fix for descriptionIDs.
Merge branch 'avaneesh'
Avaneesh: Merging PM files and adding logging to Editor and Test modes.
Beginning version 1.1 for release Jan 23
Merge branch 'master' of http://github.com/bvds/LaitsV3
Incrementing version number for pm merge changes.
Fixing conflict between merged PM and fix for re-enabling editor box when it should not be.
Merge branch 'master' into avaneesh

erging master into avaneesh