Merge branch 'master' into feature/108-collaborators
change in karma
polling to refresh comments
Merge branch 'feature/108-collaborators'