Updates
Merge branch 'master' of https://github.com/michaeltli/collabreate
Updates
Merge branch 'master' of https://github.com/michaeltli/collabreate