MDL-16464 qtype_multichoice: fix missed question -> questionid.
Merge branch 'MDL-16464' of https://github.com/timhunt/moodle
MDL-42023 assign: Add Edit PDF plugin to core.

This plugin is heavily based on the uploadpdf plugin from
Davo Smith <git@davosmith.co.uk>. This is a fantastic plugin
that provides a great benefit for teachers marking assignments.

A big thankyou to Davo for writing the plugin and helping us to
get it integrated to core.

The plugin provides a pdf editing interface in the teachers browser
that lets them add comments and annotations to a students assignment
submission. The comment and annotations are then added to a pdf version
of the students submission which is send back to the student so they can
download it, or read it online.

This plugin has been primarily worked on by Damyon Wiese, Jerome Mouneyrac
and Barbara Ramiro. We have also had great feedback and suggestions from others
including the entire frontend team, Martin and Frederic Massart.
MDL-42023 assign: Edit PDF plugin - Jerome's contributions
MDL-42023 assign: Edit PDF plugin - Barbara's contributions
MDL-42023 assign: Edit PDF plugin - Damyon's contributions
Revert "MDL-33569 themes: Labels create extra margin below content."

This reverts commits:
* 336c57575bd4b72ae8d52fdc5b50faeeffe8dd56.
* c528917d3f6e84a132b6eff2bb06a7ed7eb992fa.
MDL-41241 Atto: Restrict searching for anchor tags to selection.
MDL-40770 TinyMCE - Restoring border to colour selectors
Merge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Merge branch 'MDL-42023-master' of git://github.com/damyon/moodle
MDL-40829 frontpage course heading: add padding to coursename and fix info ajax