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
Merge branch 'master' of git://github.com/MarkUsProject/Markus
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
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
Revision from line 1 to 600 of the pt-br translation
Revision until line 675
Review until line 800
Finished portuguese translation revision
Undoing change on assingment per page defaut