Add rspec tests for Group model
Shorten some lines that were too long
Merge branch 'master' into group_rspec
Shorten line that was too long
Fix unused variable
Remove group_test.rb
Migrate two tests from group_test.rb to grouping_spec.rb
Merge branch 'master' into group_rspec
Add space before } as requested by houndci
Merge pull request #1800 from ifung/group_rspec

Add rspec tests for Group model
Fix Issue #1720
Remove old sort images
Merge pull request #1820 from ifung/issue-1720

Fixes #1720
Merge branch 'master' of git://github.com/MarkUsProject/Markus into issue-1726
Added upload disable feature to flexible criteria rubric view