MDL-31405 Assignment reset issue solved
MDL-31405 Assignment: Fixed date in reset to be called once

Conflicts:

	mod/assign/locallib.php
MDL-29441 Chat: Use a valid name for chat popup actions
MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability
MDL-41339 Tags: Added unique tag instance id to tag_get_tags functions

Avoids php warnings on creating new tags
MDL-42112 Tablelib: Add unit tests (some)
MDL-42112 tablelib: Generate the correct number of cols for empty rows

(And a test for it).
MDL-42386 fix invalid etag comparison

Credit goes to Eloy Lafuente, thanks!
MDL-37813 remove missing filters when configuring string filters and fix filter uninstall
Merge branch 'wip-mdl-31405-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE
MDL-31405 assign: avoid uncessary get_string call
Merge branch 'MDL-26244_url_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE
MDL-34209 JavaScript: Simplify section drag/drop to fix reordering issues
MDL-42201 backup: introduced new automatic backup state
Merge branch 'w43_MDL-42386_m24_etag' of https://github.com/skodak/moodle into MOODLE_24_STABLE
MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission
Merge branch 'MDL-34209-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE
Merge branch 'MDL-42201_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully (it only concerns the alternative chat methods)
Merge branch 'MDL-42239-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE