add javascript and JSON files
Fixed merge conflicts