Edited multi-project
Fixed studid merge-conflict
Merge branch 'master' of github.com:Thalmann/swf613-rapport