Merge remote-tracking branch 'origin/master' into eric_config_parser

let's get it done

default.config

@@ -12,6 +12,13 @@ server {
 	index index.html; # this is another comment
 	root /website;
 
+# If not explicitly set, ConfigParser need to genererate a location block
+# like this for path "/" (based on field "root" and "index" of the server)
+	location / {
+		root ./www/;
+		index index.html;
+	}
+
 	allow_methods GET;
 
 
@@ -22,4 +29,3 @@ server {
 	}
 
 }
-