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.
Changed == to === in javascript
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
Enable racket highlighting with block comments
Use old regex syntax
Merge pull request #1812 from bmuscede/issue-1726

Fixes #1726
Merge pull request #1832 from david-yz-liu/racket-highlighting

Enable racket highlighting with block comments
Merge pull request #1817 from kubasub/master

Created rspec tests for Assignment's associations and attributes
Enable summaries view for TAs
Make flexible criteria visible