Merge branch 'master' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

gondor.yml

@@ -2,3 +2,6 @@ site: eldarion-clients-uw/td
 exec:
     web: gunicorn --bind=0.0.0.0 --log-file - td.wsgi
     worker: celery worker --app=td --concurrency=4 --loglevel=WARNING --pool=prefork --no-color
+branches:
+  master: primary
+  develop: demo