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
Merge branch 'master' of git://github.com/MarkUsProject/Markus into issue-1726
Added upload disable feature to flexible criteria rubric view
Merge pull request #1812 from bmuscede/issue-1726

Fixes #1726