no message
Merge branch 'master' of https://github.com/realjade/svg

Conflicts:
	static/js/apps/svg.js
Merge branch 'master' of https://github.com/realjade/svg

Conflicts:
	static/js/apps/svg.js
merge