Initial commit
Merge branch 'master' into HEAD
Merge commit 'd3014de7ce95d9a34bf08429f90cc3b227bfc67d'

* commit 'd3014de7ce95d9a34bf08429f90cc3b227bfc67d':
  Initial commit
Merge branch 'staging'

* staging:
  WF-16: Updates styles for justification read-only view. Grants read permissions for uploaded files to other team members when they view the survey
Merge branch 'staging'
Merge branch 'WF-16'

* WF-16:
  WF-16: removes Google Drive email notifications, updates read-only view of file list
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
WF-16: Updates to file upload behavior (allow filename to be updated, removes text input for URL)
Merge branch 'master' of thinkoomph.git.beanstalkapp.com:/thinkoomph/w3f

# By Ben Doherty
# Via Ben Doherty
* 'master' of thinkoomph.git.beanstalkapp.com:/thinkoomph/w3f:
  Fixed content-type typo
Merge branch 'staging'

* staging:
  Sets model.locked and model.uploaded to true after external call to Google APIs
  model.uploadState -> uploadState
  WF-16: Updates to file upload behavior (allow filename to be updated, removes text input for URL)

Conflicts:
	js/w3f-survey.js
model.uploadState -> uploadState
Merge branch 'staging'
Merge branch 'staging' [deploy:production]
Fold in Tim's fix from 5/25
Fix duplicate / race condition when gapi_authenticated is called asynchronously
Merge branch 'staging' [deploy:production]
Response field for privateNotes is 'privatenotes', duh