Added javascripts to index.html
Fixed JSON loading
Merge origin/master