Merge branch '005-editing-server' into 'master'

WIP : 005 editing server

See merge request !7
1 job for master in 13 seconds (queued for 3 seconds)