SVG
Merge remote-tracking branch 'origin/master'

Conflicts:
	collab/index.php
	collab/welcome.php