Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Fixed issue #1376, will now give user warnings when they upload a non .csv file or no file
ssl_requirement: using a gem instead of vendor/plugin
Replaced deprecated error.add_to_base to display error
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Added javascript function to handle marking state changes
Updated view rjs files to call js function created to handle state changes
Removed redundant error clearing line in javascript code
Updated grade_entry_forms_controller and forms.
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Added functional tests for this issue.
Added tests for #1376 and a file needed for the tests.
Fix for issue #1310
Removeing ssl plugin, gem was inserted
Simplified changes and updated js fix to avoid reloading client browser upon clearing error
Fixed bug where user could not modify grades after moving through pages
Made comments more helpful for modified file
Fix for issue #1220
Some update to the pt-br translation