Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict...

diff --cc theme/formal_white/style/formal_white.css
index aaf2634,fa1ec14..b458b4e
--- 1/theme/formal_white/style/formal_white.css
--- 2/theme/formal_white/style/formal_white.css
+++ b/theme/formal_white/style/formal_white.css
@@@ -79,19 -79,11 +79,24 @@@ h1.headerheading {margin:14px 11px 8px 
  #page-enrol-instances .generalbox {border:none;}
  #page-enrol-instances .select.menujump {margin-left:0.5em;}
  
 +/* environmenttable */
 +.environmenttable .error {
 +    background-color: red;
 +}
 +
 +.environmenttable .warn {
 +    background-color: yellow;
 +}
 +
 +.environmenttable .ok {
 +    background-color: lime;
 +}
 +
+ /* adminsettings */
+ #adminsettings .form-overridden {
+     background-color: yellow;
+ }
+ 
  /* tables */
  .editcourse th,
  .editcourse td,