MDL-43480 behat: Removing @_only_local tags from steps where it is not necessary
MDL-43480 behat: Adding @_file_upload and @_alert tags

Keeping the previous @_only_local and @_alerts as
this is a stable branch.
MDL-42980 clean theme: fixed add/cancel buttons position for safari on iPhone with ios7.
MDL-41062 gradebook: remove sortorder duplicates

* Upgrade function to remove duplicates from the grade item duplicates
  column. Duplicates were causing sorting to fail in some cases.
* Add some unit tests which simulate sort order duplicate data and
  verify that they have been removed.
MDL-43743 behat: Lightweight scorm package

The previous used package were adding a second iframe
inside the scorm iframe and was slow loading it;
this patch replaces it for a simple one without any
extra iframe.
MDL-43690 quiz_question_tostring missing s().

This meant that the edit quiz page sometimes had invalid HTML.
MDL-43733  use any auto-saved responses when questions are finished.

Before this, autosave was only working to save data when a student went
back in to continue an attempt. If the student, having crashed out,
never went back in and continued the attempt, their auto-saved responses
were not used when the attempt was automatically finished. That was a
rather bad oversight, which should now be fixed.
Automatically generated installer lang files
Automatically generated installer lang files
Merge branch 'MDL-40752-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-43743 mod_scorm: Adding package disclaimer

As the package is licensed under CC 3.0 we should
be compliant with attribution.
Merge branch 'wip-mdl-43306-m26' of git://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
MDL-43671 message: removed an overly cautious check
Merge branch 'MDL-43733_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
MDL-43725 report_loglive: Fixing undefined variable error

AMOS BEGIN
 CPY [page,report_log],[page,report_loglive]
AMOS END
Merge branch 'MDL-40139-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
Merge branch 'MDL-43671_message_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
Merge branch '43675-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
Merge branch 'MDL-39683-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-41062 gradebook: corrections to grade_item upgrade script, more tests