MDL-38076 usability: Fix wrong position of new 2.4 icons
MDL-37792 Conditions: Interests condition offered but not implemented
MDL-38144 categories are created in reverse sort order in externallib
Merge branch 'wip-MDL-38144-MOODLE_24_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE
Merge branch 'MDL-37792-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
MDL-37792 Conditions: Fix upgrade step in previous patch
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.
MDL-30669 - blocks: Unit tests for course_page_type_list()
MDL-37835 Assignment unit tests fail when custom submission types are installed.

The assignment generator will now take all submission/feedback modules into concideration when creating new assignments.
Merge branch 'MDL-38076-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
MDL-35127 mod_assign More efficient use of expensive database queries

Moving two relatively expensive DB queries so they are only executed when needed
instead of on every function call. They will still only execute once, and not
repeatedly during execution of the loop.
MDL-35127 Assignment - declare the variables in the outer scope (for readability)