Merge origin/master

Conflicts:
	HTML5Application/public_html/js/chip.js