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

Conflicts:
	workers/dockerfilebuild.py

endpoints/common.py

@@ -1,10 +1,12 @@
 import logging
 import urlparse
 import json
+import string
 
 from flask import make_response, render_template, request
 from flask.ext.login import login_user, UserMixin
 from flask.ext.principal import identity_changed
+from random import SystemRandom
 
 from data import model
 from data.queue import dockerfile_build_queue
@@ -83,8 +85,13 @@ def handle_dme(ex):
   return make_response(json.dumps({'message': ex.message}), 400)
 
 
+def random_string():
+  random = SystemRandom()
+  return ''.join([random.choice(string.ascii_uppercase + string.digits) for _ in range(8)])
+
 def render_page_template(name, **kwargs):
-  resp = make_response(render_template(name, route_data=json.dumps(get_route_data()), **kwargs))
+  resp = make_response(render_template(name, route_data=json.dumps(get_route_data()),
+                       cache_buster=random_string(), **kwargs))
   resp.headers['X-FRAME-OPTIONS'] = 'DENY'
   return resp