Update sifoJS
Merge branch 'master' into devel