Merge pull request #3 from UbiCollab/master

Merge pull request #18 from finnjohansen/master
Hm
Renamed and updated some DB tables to consist with new model
Merge pull request #19 from finnjohansen/master

Update ubicollab