Merge pull request #19 from finnjohansen/master

Update ubicollab