commit 2
Merge remote-tracking branch 'origin/js-branch'

Conflicts:
	test.php