Fix for issue 1437. Had some issues with github on friday so here I am again. Still learning my way around git
removed the commented line as per suggestions of Mark and Su
Merge branch 'master' into issue-1437 revisiting the submissions late icon issue to check why it is failing some of the test cases
Initial conversion to new sortable lists for rubric criteria.
Fixed weird dragging for the lists. Initial change of annotations list.
Sorting of rubric stuff works.
Merge branch 'master' of git://github.com/MarkUsProject/Markus into sortable-lists
Updated flexible criteria list. Made the add items non-sortable.
Annotations sorting works.
Fix for the test?
Merge branch 'master' of git://github.com/MarkUsProject/Markus into sortable-lists
Remove unnecessary line break

The line breaks were introduced due to the parameter names being too
long, but after some refactoring the line breaks are not needed anymore.
Refactor method signatures for reusability

The current use cases for the count update methods can live with the
current signature, but after assigning graders to criteria, the same
update needs to be performed with a modified signature.
Specify Criterion.update_assigned_groups_counts

And remove the old Test::Unit + Shoulda tests.
Specify Grouping.update_criteria_coverage_counts

The old tests in Test::Unit and Should are migrated to RSpec therefore
can be removed.
Fix mocha stubs for count update methods

The signature of the methods changed, so the stubbing calls need update
as well.
Migrate TA assignment tests to RSpec
Fix "(invalid)" markup in summary view

The markup of "(invalid)" is rendered as plain text due to the fact that
they are produced in a ERB tag without the use of `String#html_safe` or
the `raw` method.
Merge pull request #1570 from zhangsu/summary_group_invalid_span

Fix "(invalid)" markup in summary view
Merge branch 'master' into issue-1437 to make sure branch is up-to-date