Merge branch 'master' of github.com:teharrison/pipeline into develop
Merge branch 'develop' of github.com:teharrison/pipeline into develop
Merge branch 'develop' of github.com:MG-RAST/pipeline into develop
Merge branch 'master' of github.com:teharrison/pipeline into develop
added streamingupload module
Merge branch 'develop' of github.com:teharrison/pipeline into develop
template update
Merge pull request #293 from teharrison/develop

added streamingupload module, small fixes