--
Merge branch 'master' of https://github.com/spidamoo/sod.git

Conflicts:
	SoDlib/SoDlib.layout
	characterEditor/characterEditor.layout