Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' into issue-1726
Improved upload button script and implemented it in two more views.
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' into issue-1726
Fixed javascript spacing.
Added rspec tests for Assignment model's attributes and associations. Cleaned up model.
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Fixed houndci complaints
Fixed houndci complaints
Changed == to === in javascript
Fix Issue #1720
Remove old sort images
Merge pull request #1820 from ifung/issue-1720

Fixes #1720
Fix for issue 1827: added partial to view test_results in student view.
Merge branch 'master' of git://github.com/MarkUsProject/Markus into issue-1827

Making sure everythin is up to date
clear database before rspec tests are ran
Merge branch 'master' of git://github.com/MarkUsProject/Markus into issue-1726
Added upload disable feature to flexible criteria rubric view