Merge remote-tracking branch 'origin/master'

Conflicts:
	main.js
	test-main.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.js
	test-main.js