Merge branch 'MDL-36005-master' of git://github.com/damyon/moodle

Conflicts:
	version.php

diff --cc theme/base/style/core.css
Simple merge

diff --cc theme/bootstrapbase/style/moodle.css
Simple merge

diff --cc version.php
index b5764ca,1b11813..99768c6
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2013080800.00;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2013080100.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2013080801.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes