Merge pull request #368 from MG-RAST/develop

develop stuff to api
Merge pull request #391 from MG-RAST/develop

Version 3.3.6 update
Merge pull request #395 from MG-RAST/develop

Update to fix some of the broken job submissions lately and changes to new API (not being used yet)
Merge pull request #401 from MG-RAST/develop

Merging updates for hotfix
Merge pull request #404 from MG-RAST/develop

Updates to m5nr and fix for 'private' option missing from Analysis page.
Merge branch 'api' of https://github.com/MG-RAST/MG-RAST into develop
Don't need to build api-doc target every time we run make.
Merge pull request #416 from wgerlach/develop

scripts renamed
removed examples from this repo, moved scripts that transform api info to /bin dir, some cleanup
Merge pull request #417 from teharrison/develop

removed examples from this repo, moved scripts that transform api info to /bin dir, some cleanup
upload page: again fix small amplicon upload, display file_name and file_size (in bytes), sort file info
Merge pull request #418 from teharrison/develop

upload page: again fix small amplicon upload, display file_name and file_size (in bytes), sort file info
js syntax error
Merge pull request #419 from teharrison/develop

js syntax error
upload: fix add file name
Merge pull request #420 from teharrison/develop

upload: fix add file name
API matrix: added limit to number of metagenomes in query, added optional text to filter return annotations by
Merge pull request #421 from teharrison/develop

API matrix: added limit to number of metagenomes in query, added optional text to filter return annotations by
API, renamed list of metagenomes in project object from 'analyzed' to 'metagenomes' - much more intuative
Merge pull request #422 from teharrison/develop

API, renamed list of metagenomes in project object from 'analyzed' to 'metagenomes'