Merge branch 'master' into newmc

diff --combined lib/Plack/App/Gruntmaster.pm
index e0f921df77625ec0f9e9a0cc81b765fdcd876afb,edf19110c3e89f1fca0d39f9db533a83b50bbee2..288f18c95d8b6ddce1c63afebbfdb0067781b231
--- 1/lib/Plack/App/Gruntmaster.pm
--- 2/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@@ -53,7 -53,7 +53,7 @@@ use constant FORMAT_EXTENSION => 
        SBCL => 'l',
  };
  
- use constant NOT_FOUND => [404, ['Content-Type' => 'text/plain'], ['Not found']];
+ use constant NOT_FOUND => [404, ['X-Forever' => 1, 'Content-Type' => 'text/plain'], ['Not found']];
  use constant FORBIDDEN => [401, ['Content-Type' => 'text/plain', 'WWW-Authenticate' => 'Basic realm="Gruntmaster 6000"'], ['Forbidden']];
  
  sub development() { ($ENV{PLACK_ENV} // 'development') eq 'development' }
@@@ -115,6 -115,9 +115,9 @@@ sub dispatch_request
                        [200, \@headers, [development ? $js : JavaScript::Minifier::XS::minify $js]]
                },
  
+               sub (/robots.txt) { NOT_FOUND },
+               sub (/favicon.ico) { NOT_FOUND },
+ 
                sub (/src/:job) {
                        return NOT_FOUND if !job;
                        my $isowner = remote_user && remote_user->id eq job->rawowner;
@@@ -163,8 -166,7 +166,8 @@@
  
                sub (/ed/:contest) {
                        forbid contest->is_running;
 -                      response ed => 'Editorial of ' . contest->name, db->problem_list(contest => $_{contest}, solution => 1);
 +                      my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
 +                      response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial};
                },
  
                sub (/login) {