Updated questions in common-questions.js
Fixed syntax error in common-questions.js
New questions for ss-overridable-noproceed.js
Questions and Jasmine tests for ssl-overridable-noproceed condition
Fixed trailing whitespace
Merge conflict fixes
Fixed tests
Merge branch 'master' into qtext
Merge pull request #102 from adrifelt/master

Send OS automagically
sdf
remove logging statement
Merge pull request #103 from adrifelt/urlupload

Upload URL if participant consents
fixed
Merge pull request #105 from adrifelt/bugfix

Fix issue with URL uploading
Merge remote-tracking branch 'upstream/master' into ssl-over-no-qtext
Removed visit question for ssl-overridable-noproceed and updated tests
Changed 'Who do you think the page was from?' back to 'Who was the page from?'
Merge pull request #100 from moduloprime/ssl-over-no-qtext

New question text for ssl-overridable-noproceed condition
bump manifest
Merge pull request #107 from adrifelt/manifest

Bump manifest values