doing more transcriptions stuff
conflicts
Merge branch 'master' of https://github.com/tu-software-studio/websurv
Finishing up transcription CRUD