Blanking master to work on feature branches instead for easier pull requests
Merge remote-tracking branch 'upstream/master'

Conflicts:
	backend/models.py
	backend/survey_backend_api.py
Reverting accidental deletion of app.yaml
Base framework for how the extension will work.

Includes the manifest with appropriate permissions, some sample HTML
forms, and the important events and flows that the background page will
need to handle.

This has not been tested yet.
Add JSDOC comments to all functions in the background script.
Moved CSS to external stylesheets for both the consent form and the
example survey.

Added a surrounding div with id for the survey title.
Merge pull request #3 from christhompson/extension-base

Extension base