Merge pull request #20 from finnjohansen/master

Update ubicollab