Merge branch 'feature/cleanup-popups' into wdtk
Merge branch 'feature/cleanup-popups' into wdtk
Merge branch 'feature/cleanup-popups' into wdtk
Add <br/>s in the Welsh title on the homepage

Otherwise the long title overlaps the flying computer logo.
Use escape_javascript on translated strings in Javascript strings

The Welsh translations of some of these words contain single quotes;
escape them in the view so that the Javascript doesn't contain
syntax errors.
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
Latest version of Welsh translation

Includes interpolated variable name fix for "Efallai y byddwch yn gallu
dod o hyd i un ar eu gwefan, neu drwy eu ffonio nhw a gofyn. Os
llwyddwch i ddod o hyd i un, <a href=\"{{url}}\"> anfonwch e atom</a>."
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
Upgrade to latest version of Rails
Merge branch 'hotfix/0.16.0.7' into wdtk