Merge branch 'feature/cleanup-popups' into wdtk
Merge branch 'feature/cleanup-popups' into wdtk
Merge branch 'feature/cleanup-popups' into wdtk
Merge branch 'release/0.16' into wdtk
Restore survey variables.
Fix typo
Point at application.css
Fixing more typos
Merge branch 'hotfix/0.16.0.1' into wdtk

Conflicts:
    app/views/request/_view_html_stylesheet.html.erb
Merge branch 'welsh-fixes' into wdtk

Conflicts:
    locale/cy/app.po
Merge branch 'hotfix/0.16.0.3' into wdtk
Make all WDTK references use HTTPS.
Use HTTPS Google docs viewer where using HTTPS for alaveteli
Merge branch 'hotfix/0.16.0.7' into wdtk
Merge branch 'hotfix/0.16.0.8' into rails-3-develop

Conflicts:
    locale/cy/app.po