Merge origin/master

Conflicts:
	public_html/svg-edit/draw.html
Merge origin/master