Updated makefile to point to ding2 master branches
Fixed indention in js file
Merge pull request #5 from ding2tal/core-pr-4

Core pr 4
Merge branch 'master' into development
Updated make file to point to development branch
Resovled merge conflict in makefile