Merge pull request #368 from MG-RAST/develop

develop stuff to api
Merge branch 'api' of https://github.com/MG-RAST/MG-RAST into develop