Reformatted json

Reformatted JSON file.
Refactored master Javascript files to accept new JSON data.