Merge branch 'dev' into demo

www.conf

@@ -18,6 +18,10 @@ location = /404.html {
   root                ../www;
 }
 
+location = / {
+  rewrite             ^ /404.html;
+}
+
 location / {
   access_log          logs/access.log log_www buffer=64k flush=1s;
   root                ../www;