MDL-25883 correct element name for wiki comments editor
MDL-26260 quiz 'secure' window: close loophole in some themes.

Some themes put padding on body, which meant there were a few pixels
where you could get at the context menu. Oh noes!
MDL-31385 quiz: does not resume previews.
Updated bugfix according to Jerome suggestions

password check is done at lib.php instead of externallib.php

Conflicts:

	user/lib.php

Conflicts:

	user/lib.php
MDL-30878 core_user_update_users user password is reset if not specified

Conflicts:

	user/lib.php
Merge branch 'MDL-31385_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
Merge branch 'MDL-26260_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
weekly release 2.0.7+
MDL-25185 - data - Allowing data from the database to be exported according to group roles.
MDL-31463 - navigation - added a context check in the navigation for fullname permission.
MDL-27654 Insert a space into the somefieldrequired string
MDL-26807 Updating the withselectedusers_help string
MDL-27285 Updating string grammar on the wiki module's links page
weekly release 2.0.7+
Merge branch 'MDL-25883-20' of https://github.com/mackensen/moodle into MOODLE_20_STABLE
Merge branch 'wip-MDL-31463-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE
Merge branch 'wip-MDL-25185-MOODLE_20_STABLE' of git://github.com/abgreeve/moodle into MOODLE_20_STABLE
Merge branch '20_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE
Merge branch '20_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE
Merge branch '20_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle into MOODLE_20_STABLE