Fix for issue 1377. Modified code to have sort_by to be populated when initialized
Merge branch 'master' into issue-1377
Fix for grader JS issue. Also tweaked a titlebar that I missed.
Fix for IE
Switched to new main.scss file (login/main admin dashboard pages).
Update of PR 1325
Missed some commas
Fix flakyness in specs

When updating the counts, The ID arrays used are not the original array
passed to the caller method. They are being returned by ActiveRecord
with no defined order, so an exact equality check sometimes fail (which
is why this was not caught in the first place). The correct way of
doing it would be matching the set of element, hence the `match_array`
calls.

Tested:
- rspec
Fix assignment factory associations and ID

The short ID must be unique but the words generated by Faker is not.

The two associations should be lazily loaded, or else in some cases an
assignment might get created with null values for these associations.
Update of PR 1323
Some JS conversions in assets/javascripts. (And some formatting here and there)
Forgot to remove an alert I was using for testing
Lots o formatting
Converted rjs files to js.erb in views/annotations
Avoid looking up parameters already cached in instance variables
Merge pull request #1598 from arkon/grader-js

Fixes #1597.
Merge pull request #1599 from arkon/IE-classList

Fix for IE
Merge pull request #1601 from arkon/js-shared

Convert rjs to js.erb for shared folder
Merge pull request #1604 from arkon/js-results

Migration from Prototype to jQuery for results folder
Merge pull request #1602 from zhangsu/rspec_flakyness

Fix flakiness in specs