ok
Merge remote-tracking branch 'origin/master' into newPol

Conflicts:
	asset/2.gif
oookk
joints are now always same