Updated makefile to point to ding2 master branches
Refactored function names to match code guidelines
Updated comments in JS about wrapper classes
Removed the use of ID's from the javascript
Merge pull request #4 from ding2tal/core-pr-4

Core pr 4
Resolved merge conflict
Updated make file to point to development branch
Resovled merge conflict in makefile