token , url
Merge pull request #202 from wgerlach/master

token , url
Merge branch 'master' of https://github.com/MG-RAST/Shock
attribute upload for client script