Added Entity class
Added Entity class
Merge origin/master
Fixed various errors in main javascript