merge head
Merge branch 'master' of https://github.com/izyl/svgeditor.git

Conflicts:
	resources/svgeditor/js/Boot.js
Pigeon svg