Add initial JS sections to improve merge
Merge branch 'master' into js-style-guide

Conflicts:
	javascript.md