Merge branch 'master' of github.com:benjaminvialle/Markus into machinist2
Fix: tests
Fix: tests
Merge branch 'master' into machinist2
Merge pull request #1205 from danielstjules/issue-1202

Closes #1202: missing user name in error message when trying to add inactive user to group
Merge pull request #1206 from danielstjules/issue-1203

Closes #1203: rubrics_controller now updates weights
Merge pull request #1207 from danielstjules/trailing-whitespace

Remove trailing whitespace and tabs
Merge branch 'master' of github.com:benjaminvialle/Markus into machinist2