diff --git a/README.markdown b/README.markdown
index 10246aca..0a9558e6 100644
--- a/README.markdown
+++ b/README.markdown
@@ -7,6 +7,13 @@ It is written and programmable in Python. LGPLv3 License
 Learn more at http://web2py.com
 
 
+## Google App Engine deployment
+
+    cp examples/app.yaml ./
+    cp handlers/gaehandler.py ./
+    
+Then edit ./app.yaml and replace "yourappname" with yourappname.
+
 ## Tests
 
 [![Build Status](https://travis-ci.org/web2py/web2py.png)](https://travis-ci.org/web2py/web2py)
diff --git a/VERSION b/VERSION
index efcf0954..9fd29c37 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.9.5-trunk+timestamp.2014.03.29.17.18.01
+Version 2.9.5-trunk+timestamp.2014.03.29.17.27.37
diff --git a/applications/admin/static/css/web2py.css b/applications/admin/static/css/web2py.css
index 30d97035..9816e36c 100644
--- a/applications/admin/static/css/web2py.css
+++ b/applications/admin/static/css/web2py.css
@@ -36,7 +36,7 @@ audio {width:200px}
 .hidden {display:none;visibility:visible}
 .right {float:right; text-align:right}
 .left {float:left; text-align:left}
-.center {width:100; text-align:center; vertical-align:middle}
+.center {width:100%; text-align:center; vertical-align:middle}
 /** end **/
 
 /* Sticky footer begin */
@@ -302,6 +302,11 @@ li.w2p_grid_breadcrumb_elem {
 .web2py_console input, .web2py_console select,
 .web2py_console a { margin: 2px; }
 
+.web2py_htmltable {
+   width: 100%;
+   overflow-x: auto;
+   -ms-overflow-x:scroll;
+}
 
 #wiki_page_body {
    width: 600px;
diff --git a/applications/examples/static/css/web2py.css b/applications/examples/static/css/web2py.css
index 30d97035..9816e36c 100644
--- a/applications/examples/static/css/web2py.css
+++ b/applications/examples/static/css/web2py.css
@@ -36,7 +36,7 @@ audio {width:200px}
 .hidden {display:none;visibility:visible}
 .right {float:right; text-align:right}
 .left {float:left; text-align:left}
-.center {width:100; text-align:center; vertical-align:middle}
+.center {width:100%; text-align:center; vertical-align:middle}
 /** end **/
 
 /* Sticky footer begin */
@@ -302,6 +302,11 @@ li.w2p_grid_breadcrumb_elem {
 .web2py_console input, .web2py_console select,
 .web2py_console a { margin: 2px; }
 
+.web2py_htmltable {
+   width: 100%;
+   overflow-x: auto;
+   -ms-overflow-x:scroll;
+}
 
 #wiki_page_body {
    width: 600px;
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css
index dfba3fdd..9816e36c 100644
--- a/applications/welcome/static/css/web2py.css
+++ b/applications/welcome/static/css/web2py.css
@@ -302,6 +302,11 @@ li.w2p_grid_breadcrumb_elem {
 .web2py_console input, .web2py_console select,
 .web2py_console a { margin: 2px; }
 
+.web2py_htmltable {
+   width: 100%;
+   overflow-x: auto;
+   -ms-overflow-x:scroll;
+}
 
 #wiki_page_body {
    width: 600px;
diff --git a/examples/app.example.yaml b/examples/app.example.yaml
index ff608af1..46cf7bb0 100644
--- a/examples/app.example.yaml
+++ b/examples/app.example.yaml
@@ -3,19 +3,15 @@
 #  See http://code.google.com/appengine/docs/python/config/appconfig.html
 #  and http://web2py.com/book/default/chapter/11?search=app.yaml
 
-application: web2py
+application: yourappname
 version: 1
 api_version: 1
 
-# use this line for Python 2.5
-#
-runtime: python
-
 # use these lines for Python 2.7
 # upload app with: appcfg.py update web2py (where 'web2py' is web2py's root directory)
 #
-# runtime: python27
-# threadsafe: true    # true for WSGI & concurrent requests (Python 2.7 only)
+runtime: python27
+threadsafe: true    # true for WSGI & concurrent requests (Python 2.7 only)
 
 default_expiration: "24h"   # for static files
 
@@ -45,8 +41,7 @@ handlers:
   upload: applications/welcome/static/robots.txt
 
 - url: .*
-  script: gaehandler.py         # CGI
-#  script: gaehandler.wsgiapp    # WSGI (Python 2.7 only)
+  script: gaehandler.wsgiapp    # WSGI (Python 2.7 only)
   secure: optional
 
 admin_console: