Merge branch 'hotfix/2013-06-12-hotfix'
Fix sentry 5823661: View queries for topic was wrong (assumed single topic)
Work around a HVAD bug in project_sheet/ajax.py.  Fixes #1540, #1554 and neverending Loading... message on project sheet questions
Merge branch 'hotfix/2013-06-16-hotfix-sentry' into develop