Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project - html2img/html2img.js