Merge remote-tracking branch 'origin/Joachim/Test'
Merge branch 'master' of github.com:charleric/projectone