MDL-35185 import Flowplayer 3.2.14
MDL-35175 - Lesson shows no attempts if associated with a grouping
MDL-28692 theme_base: Added background-color to admin settings form overridden in base/style/admin.css
MDL-38061 Assignment - Use $CFG->showuseridentity to add extra fields to the assignment grading table/user summary.

Conflicts:

	mod/assign/gradingtable.php
	mod/assign/locallib.php
	mod/assign/renderable.php
	mod/assign/renderer.php
MDL-38091 fixed bug with SQL query on Oracle
Automatically generated installer lang files
Merge branch 'MDL-35175_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
Merge branch 'MDL-38061-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Merge branch 'wip-MDL-38091-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Merge branch 'MDL-28692_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
MDL-28692 Base theme - Version bump for css change
MDL-38144 categories are created in reverse sort order in externallib
Merge branch 'wip-MDL-38144-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.

Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
Merge branch 'wip_MDL-35641_m23_flowbackport' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
weekly release 2.3.4+