Merge pull request #1293 from xiangyu89/issue-1211-fixed

Fix for issue-1211: added html_safe to unescape html <span> tag
Merge pull request #1292 from xiangyu89/issue-1033-fixed

Fix for issue-1033 : all info is now updated when the result is marked as complete
Merge pull request #1291 from xiangyu89/issue-1001-fixed

Fix for issue-1001: added code to update group coverage when graders are randomly assigned to criteria
Merge pull request #1213 from wroy/issue-717

Fixing issue-717 and removing unnecessary pipe character from grader sub...
Merge pull request #1215 from daniyall/issue-1214

Fixed issue #1214. If instructor does not allow students to form own grou...
Merge pull request #1210 from danielstjules/annotations

Fixed positioning of the 'Delete annotation category' button
Merge pull request #1206 from danielstjules/issue-1203

Closes #1203: rubrics_controller now updates weights
Merge pull request #1205 from danielstjules/issue-1202

Closes #1202: missing user name in error message when trying to add inactive user to group
Merge pull request #1201 from danielstjules/failing-test

Closes #1188: Updated get_collection to use case-insensitive filtering
Merge pull request #1212 from danielstjules/notes

Fix position of 'Note:' in the Notes edit page
Merge pull request #1209 from drunkel/issue-999

Closes #999. Added created_by and last_edited_by fields to annotation texts.
Fixed exception in grade_entry_form.rb, fixed failing tests in grade_entry_forms_controller_test.rb
Merge pull request #1229 from ariannedee/master

Closes #1194 Add order (position) to grade entry form items
Merge pull request #1288 from ariannedee/master

Fix for Issue-100: Refactor the code for calculating a student's average mark
Fix: encoding in schema.rb (compatibility with ruby 1.9)
Updated: changelog for 1.0-beta and MARKUS_VERSION
Merge pull request #1307 from benjaminvialle/1.0.x

1.0.x