Fixed issue #1376, will now give user warnings when they upload a non .csv file or no file
Updated grade_entry_forms_controller and forms.
Added functional tests for this issue.
Added tests for #1376 and a file needed for the tests.
Fix for issue #1310
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
Merge pull request #1395 from rafaspadilha/pt-br_translation

Revision of Portuguese translation
Merge pull request #1381 from davidrd/issue-1376

Closes #1376 - Created by, Last edited by aren't set when annotation is created in grading view
Merge pull request #1391 from Gerb11/master

Closes #1310 - Created by, Last edited by aren't set when annotation is created in grading view
Merge pull request #1390 from cj343/issue-1378

Closes #1378 - Sorting of Marks Spreadsheet
Merge branch 'master' of git://github.com/MarkUsProject/Markus