add edit-server
edit-server fix
added sonic pi
Merge remote-tracking branch 'origin/sonic-pi' into dev
Merge branch 'dev'