Merge branch 'develop'

* develop:
  disable per default the watchdog

Author: sylvainraye

app/code/community/Hackathon/MageMonitoring/etc/config.xml

@@ -25,7 +25,7 @@
         <Hackathon_MageMonitoring>
             <version>2.1.3</version>
             <depends>
-                <Mage_Adminhtml />
+                <Mage_Adminhtml/>
             </depends>
         </Hackathon_MageMonitoring>
     </modules>
@@ -147,8 +147,6 @@
     </admin>
 
 
-
-
     <adminhtml>
         <layout>
             <updates>
@@ -184,6 +182,14 @@
 
     <default>
         <magemonitoring>
+            <widgets>
+                <Hackathon_MageMonitoring_Model_Widget_System_Watchdog>
+                    <dogs>
+                        <disabled>1</disabled>
+                    </dogs>
+                </Hackathon_MageMonitoring_Model_Widget_System_Watchdog>
+            </widgets>
+
             <tabs>
                 <health_check>
                     <label>Health Check</label>