Adjusted spacing in variables file
update javascript files to v2.3.0
update docs to v2.3.0
Merged in 2774287
Started integrating new batch of upstream updates
Updated ignore file
Resolved merge conflict