Merge branch 'MDL-49504-master' of git://github.com/jleyva/moodle

Conflicts:
	lib/db/services.php
	version.php

diff --cc lib/db/services.php
index d79dcb6,086406f..43b640a
--- 1/lib/db/services.php
--- 2/lib/db/services.php
+++ b/lib/db/services.php
@@@ -1092,9 -1077,7 +1101,10 @@@ $services = array
              'core_course_view_course',
              'core_completion_get_activities_completion_status',
              'core_notes_get_course_notes',
 +            'core_completion_get_course_completion_status',
 +            'core_user_view_user_list',
 +            'core_message_mark_message_read',
+             'core_notes_view_notes',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,

diff --cc version.php
index 4fba9ee,31a138f..9b1ee5c
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015040700.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015040200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015040700.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.