Merge conflit

conf/Conf.php.sample

@@ -10,7 +10,8 @@ class Conf {
 
         public static $DB_PP         = '';
 
-        public static $KK = "";
+        // generate an admin password with: echo password|sha1sum|awk '{print $1}';
+        public static $KK            = "to_replace_with_your_admin_pass";
 
 }