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

Conflicts:
	test/data/test.db

endpoints/common.py

@@ -91,7 +91,7 @@ def random_string():
 
 def render_page_template(name, **kwargs):
   resp = make_response(render_template(name, route_data=json.dumps(get_route_data()),
-                       cache_buster=random_string(), **kwargs))
+                       cache_buster='foobarbaz', **kwargs))
   resp.headers['X-FRAME-OPTIONS'] = 'DENY'
   return resp