Fixed adding criterion for assignments under the 'flexible' marking scheme. The functionality to add, delete, get the sum of marks, and flash messages for flexible criterion did not work.
Review board fixes
Merge branch 'master' into issue745
FIX for issue 840, login input fields aligned properly
Merge branch 'master' into issue-850
Removed all references to ImageMagick in INSTALL document.
add rvmrc file integration
added rvmrc!
add bundler install and gemset and ruby creation to rvmrc
added .use-ruby option
added ignore .use-ruby-* to gitignore
Merge branch 'master' of git://github.com/MarkUsProject/Markus into issue-840
Display warning if no group is selected on a global action
fixing duplicate code
putting in missing closing div
Merge branch 'master' of git://github.com/MarkUsProject/Markus
FIX for issue 847, notes modal dialog now correctly aligned on Chrome/Firefox, can't resize textarea anymore
Fixing pagination and jump to drop down in mark spreadsheet view
Merge branch 'issue879' of git://github.com/kiramccoan/Markus
Merge branch 'issue271' of git://github.com/kiramccoan/Markus
Fixed error message alignment
fixing spacing
Add ghostscript info in INSTALL document.
moving code to a partial and adding warning for when student is not selected on an add to group action