Allowed a token to be used in survey upload.

References ucla/ohmage#182
Merge branch 'master' into ohmage-2.15