added editing of texts and messages
Merge branch 'niklasAdminWork' into dev