Fixes #1722
Fixed formatting
Fixed formatting... again
Trying to fix formatting still...
Fix annotation scrolling
Restore default value of PDF_STORAGE
Removed trailing whitespace
Merge pull request #1780 from toriverly/issue-1722

Fixes #1722
Merge pull request #1794 from david-yz-liu/issue-1788

Issue 1788
Fix rails database method
Merge pull request #1803 from david-yz-liu/results-missing-template

Fix rails database method (renders TAs unable to access grading page)
Merge branch 'master' of git://github.com/MarkUsProject/Markus