finish issue 108
Merge branch 'feature/108-collaborators'
Merge branch 'master' into prod