changes
changes in signin and collaboration count
changes in phantomjs
solve conflicts
Merge remote-tracking branch 'origin/feature/108-collaborators'
Merge branch 'master' into prod