Merge branch 'ohmage-2.16' of github.com:cens/ohmageServer into ohmage-2.16
Allowed stream/data to be GZIP'd attachments.

When calling survey/upload, the "data" parameter may now be an attachment. Also, if that attachment has a GZIP content type, it will attempt to be de-GZIP'd before it is processed.
Merge branch 'ohmage-2.16' of github.com:ohmage/server into ohmage-2.16
Added custom GZIP handling back in to support older ohmage Android clients
Merge branch 'ohmage-2.16' of github.com:ohmage/server