Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle

diff --cc lang/en/admin.php
Simple merge

diff --cc version.php
index a570f6f,4db2d29..cd50167
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2014071100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2014070300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2014071500.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.