Added editsocio and functions
Merge branch 'feature/editsocio'