MDL-41352 MyMobile - fixing region/layout/drag-n-drop issues
MDL-42072 badges: Fix output and headers in badges ajax scripts
MDL-32570 enrol_imsenterprise: don't hardcode default category id
MDL-41967 - Gradebook: Fixed an sql syntax error for gradebook custom profile fields.
MDL-41659 badges: Display course/site names through format_string()
MDL-25176 forum Redirects for new discussions shouldn't use SESSION

Unset the session->fromdiscussion var, because we know that the correct
path will be computed later.
MDL-41744 Users: Convert key to value in bulk upload

Menu profile field expects value, during bulk upload if value is passed by form
then options key is passed. So converting key to value if passed though form
MDL-42122 block_community: Dont show install option without capability
MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads

Conflicts:
	mod/assign/locallib.php
MDL-42013 behat: Fixing problem with should not see

Using 'should see' outputs rather than an incorrect
xpath query. Also our custom selectors are not properly
used by WebAssert so switching to find xpath.
MDL-42013 behat: Fixing related tests

We had no false positives because of this
issue, but some checking have been restricted
to specific DOM parts.
MDL-41197 ignore all problems when converting texts
MDL-42047 fix cohort method name error after deleting cohort
MDL-42069 mod_quiz add lastname sort for manual grading
MDL-41520 LTI: Does not track page views for completion
MDL-40226 Files: Added the correct MIME Type for JNLP files.
JNLP stands for Java Network Launch Protocol, used to launch
Java Web Start applications. More details in:
http://docs.oracle.com/javase/tutorial/deployment/webstart/deploying.html
Merge branch 'MDL-41352-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
Merge branch 'w41_MDL-41197_m25_convnotices' of https://github.com/skodak/moodle into MOODLE_25_STABLE
Merge branch 'MDL-42072_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE
Merge branch 'MDL-42013_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE