Found bugs/fixed bugs
Merging my changes with the remote... (Andrew's)
Merge branch 'EditorAPI_Integration' of https://github.com/Watson-Reboot-Project/JavaScriptLab-Sandbox into EditorAPI_Integration