Basic flow for edit server
Server editting
Merge branch 'feature/server-edit-controller' into develop