Merge branch 'branch2.4'

Conflicts:
	website/sphinx/database.rst

website/app.yaml

@@ -1,14 +1,15 @@
-application: python-tornado
-version: 2
-runtime: python
+application: python-tornado-hrd
+version: 3
+runtime: python27
 api_version: 1
+threadsafe: yes
 
 handlers:
 - url: /static/tornado-0.1.tar.gz
-  script: website.py
+  script: website.application
 
 - url: /static/tornado-0.2.tar.gz
-  script: website.py
+  script: website.application
 
 - url: /static/
   static_dir: static
@@ -22,10 +23,10 @@ handlers:
   upload: static/favicon.ico
 
 - url: /documentation/?
-  script: website.py
+  script: website.application
 
 - url: /documentation
   static_dir: sphinx/build/html
 
 - url: /.*
-  script: website.py
+  script: website.application

website/website.py

@@ -18,7 +18,6 @@ import os
 import os.path
 import tornado.web
 import tornado.wsgi
-import wsgiref.handlers
 
 
 class ContentHandler(tornado.web.RequestHandler):
@@ -46,11 +45,3 @@ application = tornado.wsgi.WSGIApplication([
      dict(url="/documentation/index.html")),
 
 ], **settings)
-
-
-def main():
-    wsgiref.handlers.CGIHandler().run(application)
-
-
-if __name__ == "__main__":
-    main()